From 50105f88e4142ebf5e3786cd84588e2a7abbcf10 Mon Sep 17 00:00:00 2001 From: thickbrick Date: Sat, 6 Nov 2010 03:10:09 +0200 Subject: Bug #681: About Land->Audio doesn't do anything Uncomment the code needed for this panel to work. This was commented out in the inital Snowglobe media plugings merge, and somehow we got that too. --- linden/indra/newview/llfloaterland.cpp | 8 ++++---- linden/indra/newview/llfloaterland.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'linden/indra') 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) factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this); -// factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this); + factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this); factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); @@ -245,7 +245,7 @@ void LLFloaterLand::refresh() mPanelGeneral->refresh(); mPanelObjects->refresh(); mPanelOptions->refresh(); -// mPanelAudio->refresh(); + mPanelAudio->refresh(); mPanelMedia->refresh(); mPanelAccess->refresh(); } @@ -284,7 +284,7 @@ void* LLFloaterLand::createPanelLandOptions(void* data) return self->mPanelOptions; } -/* + // static void* LLFloaterLand::createPanelLandAudio(void* data) { @@ -292,7 +292,7 @@ void* LLFloaterLand::createPanelLandAudio(void* data) self->mPanelAudio = new LLPanelLandAudio(self->mParcel); return self->mPanelAudio; } -*/ + // static void* LLFloaterLand::createPanelLandMedia(void* data) { 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: LLPanelLandGeneral* mPanelGeneral; LLPanelLandObjects* mPanelObjects; LLPanelLandOptions* mPanelOptions; -// LLPanelLandAudio* mPanelAudio; + LLPanelLandAudio* mPanelAudio; LLPanelLandMedia* mPanelMedia; LLPanelLandAccess* mPanelAccess; LLPanelLandCovenant* mPanelCovenant; -- cgit v1.1