aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llfloaterland.cpp8
-rw-r--r--linden/indra/newview/llfloaterland.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 42bc41c..340245d 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -209,7 +209,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
209 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); 209 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
210 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); 210 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
211 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); 212 factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this);
213 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); 213 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this);
214 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); 214 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this);
215 215
@@ -245,7 +245,7 @@ void LLFloaterLand::refresh()
245 mPanelGeneral->refresh(); 245 mPanelGeneral->refresh();
246 mPanelObjects->refresh(); 246 mPanelObjects->refresh();
247 mPanelOptions->refresh(); 247 mPanelOptions->refresh();
248// mPanelAudio->refresh(); 248 mPanelAudio->refresh();
249 mPanelMedia->refresh(); 249 mPanelMedia->refresh();
250 mPanelAccess->refresh(); 250 mPanelAccess->refresh();
251} 251}
@@ -284,7 +284,7 @@ void* LLFloaterLand::createPanelLandOptions(void* data)
284 return self->mPanelOptions; 284 return self->mPanelOptions;
285} 285}
286 286
287/* 287
288// static 288// static
289void* LLFloaterLand::createPanelLandAudio(void* data) 289void* LLFloaterLand::createPanelLandAudio(void* data)
290{ 290{
@@ -292,7 +292,7 @@ void* LLFloaterLand::createPanelLandAudio(void* data)
292 self->mPanelAudio = new LLPanelLandAudio(self->mParcel); 292 self->mPanelAudio = new LLPanelLandAudio(self->mParcel);
293 return self->mPanelAudio; 293 return self->mPanelAudio;
294} 294}
295*/ 295
296// static 296// static
297void* LLFloaterLand::createPanelLandMedia(void* data) 297void* LLFloaterLand::createPanelLandMedia(void* data)
298{ 298{
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 4105f44..f8968a7 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -117,7 +117,7 @@ protected:
117 LLPanelLandGeneral* mPanelGeneral; 117 LLPanelLandGeneral* mPanelGeneral;
118 LLPanelLandObjects* mPanelObjects; 118 LLPanelLandObjects* mPanelObjects;
119 LLPanelLandOptions* mPanelOptions; 119 LLPanelLandOptions* mPanelOptions;
120// LLPanelLandAudio* mPanelAudio; 120 LLPanelLandAudio* mPanelAudio;
121 LLPanelLandMedia* mPanelMedia; 121 LLPanelLandMedia* mPanelMedia;
122 LLPanelLandAccess* mPanelAccess; 122 LLPanelLandAccess* mPanelAccess;
123 LLPanelLandCovenant* mPanelCovenant; 123 LLPanelLandCovenant* mPanelCovenant;