Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:geometria-lab/DevConf-2011

  • Loading branch information...
commit 38a8a48e2e6a81247bedcec71ecfcc356b5d8507 2 parents 664b607 + 82c2b40
@Shumkov authored
Showing with 3 additions and 12 deletions.
  1. +3 −12 public/swf/live_options.json
View
15 public/swf/live_options.json
@@ -4,10 +4,11 @@
"connection_controller": { "type": "control.ConnectionController" },
"slide_show_controller": { "type": "control.SlideShowController" },
"gallery_controller": { "type": "control.GalleryController" },
+ "spectrum_controller": { "type": "control.SpectrumController" },
+ //"moderator_controller": { "type": "control.ModeratorController" },
"audio_controller": { "type": "control.AudioController" },
"growl_controller": { "type": "control.GrowlController" },
"view_controller": { "type": "control.ViewController" },
- "spectrum_controller": { "type": "control.SpectrumController" },
"chat_controller": {
"type": "control.ChatController",
"factory": {
@@ -79,8 +80,7 @@
"ui_growlContainer": {
"width": 300,
"top": 55,
- "right": 5,
- "depth": -4
+ "right": 5
},
"ui_chatPanel": {
@@ -88,7 +88,6 @@
"bottom": 130,
"right": 0,
"width": 300,
- "depth": -3,
"children": {
"ui_chatToggleButton": {
@@ -154,14 +153,6 @@
"depth": 1
},
- "ui_logoPlace": {
- "depth": -1,
- "right": 10,
- "bottom": 10,
- "width": 150,
- "height": 70
- },
-
"ui_topPanel": {
"right": 0,
"left": 0,
Please sign in to comment.
Something went wrong with that request. Please try again.