diff options
Diffstat (limited to 'linden/indra/newview/llfloaterland.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterland.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp index 066b739..39de55f 100644 --- a/linden/indra/newview/llfloaterland.cpp +++ b/linden/indra/newview/llfloaterland.cpp | |||
@@ -56,6 +56,7 @@ | |||
56 | #include "lllineeditor.h" | 56 | #include "lllineeditor.h" |
57 | #include "llnamelistctrl.h" | 57 | #include "llnamelistctrl.h" |
58 | #include "llnotify.h" | 58 | #include "llnotify.h" |
59 | #include "llpanellandaudio.h" | ||
59 | #include "llpanellandmedia.h" | 60 | #include "llpanellandmedia.h" |
60 | #include "llradiogroup.h" | 61 | #include "llradiogroup.h" |
61 | #include "llscrolllistctrl.h" | 62 | #include "llscrolllistctrl.h" |
@@ -204,6 +205,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed) | |||
204 | factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); | 205 | factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); |
205 | factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); | 206 | factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); |
206 | factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this); | 207 | factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this); |
208 | // factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this); | ||
207 | factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); | 209 | factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); |
208 | factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); | 210 | factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); |
209 | 211 | ||
@@ -239,6 +241,7 @@ void LLFloaterLand::refresh() | |||
239 | mPanelGeneral->refresh(); | 241 | mPanelGeneral->refresh(); |
240 | mPanelObjects->refresh(); | 242 | mPanelObjects->refresh(); |
241 | mPanelOptions->refresh(); | 243 | mPanelOptions->refresh(); |
244 | // mPanelAudio->refresh(); | ||
242 | mPanelMedia->refresh(); | 245 | mPanelMedia->refresh(); |
243 | mPanelAccess->refresh(); | 246 | mPanelAccess->refresh(); |
244 | } | 247 | } |
@@ -277,6 +280,15 @@ void* LLFloaterLand::createPanelLandOptions(void* data) | |||
277 | return self->mPanelOptions; | 280 | return self->mPanelOptions; |
278 | } | 281 | } |
279 | 282 | ||
283 | /* | ||
284 | // static | ||
285 | void* LLFloaterLand::createPanelLandAudio(void* data) | ||
286 | { | ||
287 | LLFloaterLand* self = (LLFloaterLand*)data; | ||
288 | self->mPanelAudio = new LLPanelLandAudio(self->mParcel); | ||
289 | return self->mPanelAudio; | ||
290 | } | ||
291 | */ | ||
280 | // static | 292 | // static |
281 | void* LLFloaterLand::createPanelLandMedia(void* data) | 293 | void* LLFloaterLand::createPanelLandMedia(void* data) |
282 | { | 294 | { |