aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterland.cpp')
-rw-r--r--linden/indra/newview/llfloaterland.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 7dd4f8d..42bc41c 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"
@@ -208,6 +209,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
208 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); 209 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
209 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); 210 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
210 factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this); 211 factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
212// factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this);
211 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); 213 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this);
212 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); 214 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this);
213 215
@@ -243,6 +245,7 @@ void LLFloaterLand::refresh()
243 mPanelGeneral->refresh(); 245 mPanelGeneral->refresh();
244 mPanelObjects->refresh(); 246 mPanelObjects->refresh();
245 mPanelOptions->refresh(); 247 mPanelOptions->refresh();
248// mPanelAudio->refresh();
246 mPanelMedia->refresh(); 249 mPanelMedia->refresh();
247 mPanelAccess->refresh(); 250 mPanelAccess->refresh();
248} 251}
@@ -281,6 +284,15 @@ void* LLFloaterLand::createPanelLandOptions(void* data)
281 return self->mPanelOptions; 284 return self->mPanelOptions;
282} 285}
283 286
287/*
288// static
289void* LLFloaterLand::createPanelLandAudio(void* data)
290{
291 LLFloaterLand* self = (LLFloaterLand*)data;
292 self->mPanelAudio = new LLPanelLandAudio(self->mParcel);
293 return self->mPanelAudio;
294}
295*/
284// static 296// static
285void* LLFloaterLand::createPanelLandMedia(void* data) 297void* LLFloaterLand::createPanelLandMedia(void* data)
286{ 298{