Fix a ton of run-time warnings about UI.

Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.

indra/newview/aoremotectrl.cpp

@@ -84,8 +84,11 @@ BOOL AORemoteCtrl::postBuild()
 {
 	
 	childSetAction("ao_btn", onClickToggleAO, this);
-	childSetAction("ao_sit_btn", onClickToggleAOSit, this);
+	if (gSavedSettings.getBOOL("ShowAOSitPopup"))
-	childSetAction("ao_show_btn", onClickShowAO, this);
+	{
+		childSetAction("ao_sit_btn", onClickToggleAOSit, this);
+		//childSetAction("ao_show_btn", onClickShowAO, this);
+	}
 	childSetAction("popup_btn", onClickPopupBtn, this);
 
 	return TRUE;

indra/newview/ascentprefssys.cpp

@@ -394,22 +394,22 @@ void LLPrefsAscentSys::refresh()
     childSetValue("SinguCmdLineAway",           mCmdLineAway);
 
 	//Build -------------------------------------------------------------------------------
-	childSetValue("EmeraldBuildPrefs_Alpha",        mAlpha);
+	childSetValue("alpha",               mAlpha);
-	getChild<LLColorSwatchCtrl>("EmeraldBuildPrefs_Color")->setOriginal(mColor);
+	getChild<LLColorSwatchCtrl>("colorswatch")->setOriginal(mColor);
-	childSetValue("EmeraldBuildPrefs_FullBright",   mFullBright);
+	childSetValue("EmFBToggle",          mFullBright);
-	childSetValue("EmeraldBuildPrefs_Glow",         mGlow);
+	childSetValue("glow",                mGlow);
-	childSetValue("BuildPrefs_Material",            mMaterial);
+	childSetValue("material",            mMaterial);
-	childSetValue("NextOwnerCopy",                  mNextCopy);
+	childSetValue("next_owner_copy",     mNextCopy);
-	childSetValue("NextOwnerModify",                mNextMod);
+	childSetValue("next_owner_modify",   mNextMod);
-	childSetValue("NextOwnerTransfer",              mNextTrans);
+	childSetValue("next_owner_transfer", mNextTrans);
-	childSetValue("EmeraldBuildPrefs_Phantom",      mPhantom);
+	childSetValue("EmPhantomToggle",     mPhantom);
-	childSetValue("EmeraldBuildPrefs_Physical",     mPhysical);
+	childSetValue("EmPhysicalToggle",    mPhysical);
-	childSetValue("EmeraldBuildPrefs_Shiny",        mShiny);
+	childSetValue("combobox shininess",  mShiny);
-	childSetValue("EmeraldBuildPrefs_Temporary",    mTemporary);
+	childSetValue("EmTemporaryToggle",   mTemporary);
-	childSetValue("EmeraldBuildPrefs_Texture",      mTexture);
+	childSetValue("texture control",     mTexture);
-	childSetValue("BuildPrefs_Xsize",               mXsize);
+	childSetValue("X size",              mXsize);
-	childSetValue("BuildPrefs_Ysize",               mYsize);
+	childSetValue("Y size",              mYsize);
-	childSetValue("BuildPrefs_Zsize",               mZsize);
+	childSetValue("Z size",              mZsize);
 }
 
 void LLPrefsAscentSys::cancel()

indra/newview/ascentprefsvan.cpp

@@ -57,7 +57,7 @@ LLPrefsAscentVan::LLPrefsAscentVan()
 {
     LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
 
-	childSetVisible("announce_streaming_metadata", gAudiop && gAudiop->getStreamingAudioImpl() && gAudiop->getStreamingAudioImpl()->supportsMetaData());
+	childSetVisible("announce_stream_metadata", gAudiop && gAudiop->getStreamingAudioImpl() && gAudiop->getStreamingAudioImpl()->supportsMetaData());
 
     childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this);
 

indra/newview/floaterao.cpp

@@ -356,9 +356,9 @@ BOOL LLFloaterAO::postBuild()
 	childSetAction("newcard",onClickNewCard,this);
 	childSetAction("prevstand",onClickPrevStand,this);
 	childSetAction("nextstand",onClickNextStand,this);
-	getChild<LLComboBox>("AOEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleAO));
+	getChild<LLUICtrl>("AOEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleAO));
-	getChild<LLComboBox>("AOSitsEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleSits));
+	getChild<LLUICtrl>("AOSitsEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleSits));
-	getChild<LLComboBox>("standtime")->setCommitCallback(boost::bind(&LLFloaterAO::onSpinnerCommit,_1));
+	getChild<LLUICtrl>("standtime")->setCommitCallback(boost::bind(&LLFloaterAO::onSpinnerCommit,_1));
 	mcomboBox_stands = getChild<LLComboBox>("stands");
 	mcomboBox_walks = getChild<LLComboBox>("walks");
 	mcomboBox_runs = getChild<LLComboBox>("runs");
@@ -593,7 +593,6 @@ void LLFloaterAO::updateLayout(LLFloaterAO* floater)
 		floater->childSetVisible("sits", advanced);
 		floater->childSetVisible("gsits", advanced);
 		floater->childSetVisible("crouchs", advanced);
-		floater->childSetVisible("crouchwalks", advanced);
 		floater->childSetVisible("falls", advanced);
 		floater->childSetVisible("hovers", advanced);
 		floater->childSetVisible("flys", advanced);

indra/newview/hippopanelgrids.cpp

@@ -133,7 +133,7 @@ BOOL HippoPanelGridsImpl::postBuild()
 	requires<LLButton>("btn_add");
 	requires<LLButton>("btn_copy");
 	requires<LLButton>("btn_default");
-	requires<LLButton>("btn_gridinfo");
+	//requires<LLButton>("btn_gridinfo");
 	requires<LLButton>("btn_help_render_compat");
 	if (!checkRequirements()) return false;
 	
@@ -146,7 +146,7 @@ BOOL HippoPanelGridsImpl::postBuild()
 	childSetAction("btn_add", onClickAdd, this);
 	childSetAction("btn_copy", onClickCopy, this);
 	childSetAction("btn_default", onClickDefault, this);
-	childSetAction("btn_gridinfo", onClickGridInfo, this);
+	//childSetAction("btn_gridinfo", onClickGridInfo, this);
 	childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
 	childSetAction("btn_advanced", onClickAdvanced, this);
 	

indra/newview/llchatbar.cpp

@@ -87,7 +87,7 @@ const F32 AGENT_TYPING_TIMEOUT = 5.f;	// seconds
 LLChatBar *gChatBar = NULL;
 
 // legacy calllback glue
-void toggleChatHistory(void* user_data);
+void toggleChatHistory(LLUICtrl*, const LLSD&);
 //void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
 // [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
 void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
@@ -137,19 +137,16 @@ LLChatBar::~LLChatBar()
 
 BOOL LLChatBar::postBuild()
 {
-	childSetAction("History", toggleChatHistory, this);
+	if (LLUICtrl* history_ctrl = findChild<LLUICtrl>("History"))
-	getChild<LLUICtrl>("Say")->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
+		history_ctrl->setCommitCallback(toggleChatHistory);
+	if (LLUICtrl* say_ctrl = getChild<LLUICtrl>("Say"))
+		say_ctrl->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
 
 	// attempt to bind to an existing combo box named gesture
-	setGestureCombo(getChild<LLComboBox>( "Gesture"));
+	if (LLComboBox* gesture_combo = findChild<LLComboBox>("Gesture"))
+		setGestureCombo(gesture_combo);
 
-	LLButton * sayp = getChild<LLButton>("Say");
+	mInputEditor = findChild<LLLineEditor>("Chat Editor");
-	if(sayp)
-	{
-		setDefaultBtn(sayp);
-	}
-
-	mInputEditor = getChild<LLLineEditor>("Chat Editor");
 	if (mInputEditor)
 	{
 		mInputEditor->setCallbackUserData(this);
@@ -165,9 +162,6 @@ BOOL LLChatBar::postBuild()
 		mInputEditor->setEnableLineHistory(TRUE);
 	}
 
-	mHistoryBtn.connect(this,"History");
-	mSayBtn.connect(this,"Say");
-
 	mIsBuilt = TRUE;
 
 	return TRUE;
@@ -231,9 +225,11 @@ void LLChatBar::refresh()
 		gAgent.stopTyping();
 	}
 
-	mHistoryBtn->setValue(LLFloaterChat::instanceVisible(LLSD()));
+	if (LLUICtrl* history_ctrl = findChild<LLUICtrl>("History"))
+		history_ctrl->setValue(LLFloaterChat::instanceVisible());
 
-	mSayBtn->setEnabled(mInputEditor->getText().size() > 0);
+	if (LLUICtrl* say_ctrl = getChild<LLUICtrl>("Say"))
+		say_ctrl->setEnabled(mInputEditor->getText().size() > 0);
 	//childSetEnabled("Shout", mInputEditor->getText().size() > 0); createDummyWidget Making Dummy -HgB
 
 }
@@ -897,7 +893,7 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl)
 	}
 }
 
-void toggleChatHistory(void* user_data)
+void toggleChatHistory(LLUICtrl* ctrl, const LLSD&)
 {
 	LLFloaterChat::toggleInstance(LLSD());
 }

indra/newview/llchatbar.h

@@ -110,9 +110,6 @@ protected:
 	LLComboBox*		mGestureCombo;
 
 	LLChatBarGestureObserver* mObserver;
-
-	CachedUICtrl<LLButton> mHistoryBtn;
-	CachedUICtrl<LLButton> mSayBtn;
 };
 
 extern LLChatBar *gChatBar;

indra/newview/llfloateractivespeakers.cpp

@@ -324,29 +324,33 @@ BOOL LLPanelActiveSpeakers::postBuild()
 	mSpeakerList->setSortChangedCallback(boost::bind(&LLPanelActiveSpeakers::onSortChanged,this));
 	mSpeakerList->setCallbackUserData(this);
 
-	mMuteTextCtrl = getChild<LLUICtrl>("mute_text_btn");
+	if ((mMuteTextCtrl = findChild<LLUICtrl>("mute_text_btn")))
-	childSetCommitCallback("mute_text_btn", onClickMuteTextCommit, this);
+		childSetCommitCallback("mute_text_btn", onClickMuteTextCommit, this);
 
 	mMuteVoiceCtrl = getChild<LLUICtrl>("mute_btn");
 	childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this);
 
 	childSetCommitCallback("speaker_volume", onVolumeChange, this);
 
-	mNameText = getChild<LLTextBox>("resident_name");
+	mNameText = findChild<LLTextBox>("resident_name");
 	
-	mProfileBtn = getChild<LLButton>("profile_btn");
+	if ((mProfileBtn = findChild<LLButton>("profile_btn")))
-	childSetAction("profile_btn", onClickProfile, this);
+		childSetAction("profile_btn", onClickProfile, this);
 
-	childSetCommitCallback("moderator_allow_voice", onModeratorMuteVoice, this);
+	if (findChild<LLUICtrl>("moderator_allow_voice"))
-	childSetCommitCallback("moderator_allow_text", onModeratorMuteText, this);
+	{
-	childSetCommitCallback("moderation_mode", onChangeModerationMode, this);
+		childSetCommitCallback("moderator_allow_voice", onModeratorMuteVoice, this);
+		mModeratorAllowVoiceCheckbox.connect(this,"moderator_allow_voice");
+	}
+	if (findChild<LLUICtrl>("moderator_allow_text"))
+	{
+		childSetCommitCallback("moderator_allow_text", onModeratorMuteText, this);
+		mModeratorAllowTextCheckbox.connect(this,"moderator_allow_text");
+	}
+	if (findChild<LLUICtrl>("moderator_mode"))
+		childSetCommitCallback("moderation_mode", onChangeModerationMode, this);
 
 	mVolumeSlider.connect(this,"speaker_volume");
-	mModeratorCtrlLbl.connect(this,"moderator_controls_label");
-	mModeratorAllowVoiceCheckbox.connect(this,"moderator_allow_voice");
-	mModeratorAllowTextCheckbox.connect(this,"moderator_allow_text");
-	mModeratorModePanel.connect(this,"moderation_mode_panel");
-	mModeratorControlsPanel.connect(this,"moderator_controls");
 
 	// update speaker UI
 	handleSpeakerSelect();
@@ -628,7 +632,8 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 					&& selected_id != gAgent.getID() 
 					&& (selected_speakerp.notNull() && (selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT || selected_speakerp->mType == LLSpeaker::SPEAKER_EXTERNAL)));
 
-	mModeratorCtrlLbl->setEnabled(selected_id.notNull());
+	if (LLView* view = findChild<LLView>("moderator_controls_label"))
+		view->setEnabled(selected_id.notNull());
 
 	mModeratorAllowVoiceCheckbox->setEnabled(
 		selected_id.notNull() 
@@ -660,8 +665,10 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 	LLPointer<LLSpeaker> self_speakerp = mSpeakerMgr->findSpeaker(gAgent.getID());
 	if(self_speakerp)
 	{
-		mModeratorModePanel->setVisible(self_speakerp->mIsModerator && mSpeakerMgr->isVoiceActive());
+		if (LLView* view = findChild<LLView>("moderation_mode_panel"))
-		mModeratorControlsPanel->setVisible(self_speakerp->mIsModerator);
+			view->setVisible(self_speakerp->mIsModerator && mSpeakerMgr->isVoiceActive());
+		if (LLView* view = findChild<LLView>("moderator_controls"))
+			view->setVisible(self_speakerp->mIsModerator);
 	}
 
 	// keep scroll value stable

indra/newview/llfloateractivespeakers.h

@@ -299,11 +299,8 @@ protected:
 	LLPointer<SpeakerClearListener> mSpeakerClearListener;
 
 	CachedUICtrl<LLUICtrl> mVolumeSlider;
-	CachedUICtrl<LLTextBox> mModeratorCtrlLbl;
 	CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowVoiceCheckbox;
 	CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowTextCheckbox;
-	CachedUICtrl<LLPanel> mModeratorModePanel;
-	CachedUICtrl<LLPanel> mModeratorControlsPanel;
 };
 
 

indra/newview/llfloaterblacklist.cpp

@@ -51,7 +51,7 @@ BOOL LLFloaterBlacklist::postBuild()
 	childSetAction("remove_btn", onClickRemove, this);
 	childSetAction("save_btn", onClickSave, this);
 	childSetAction("load_btn", onClickLoad, this);
-	childSetAction("rerender_btn", onClickRerender, this);
+	//childSetAction("rerender_btn", onClickRerender, this);
 	childSetVisible("copy_uuid_btn",false);
 	LLComboBox* box = getChild<LLComboBox>("asset_combo");
 	box->add("Texture",LLSD(0));

indra/newview/llfloaterchat.cpp

@@ -110,12 +110,11 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chat_history.xml", &getFactoryMap(), /*no_open =*/false);
 
 	childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
-	childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
+	//childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
-	childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
+	//childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
 	childSetVisible("Chat History Editor with mute",FALSE);
 	childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
 	childSetAction("chat_history_open", onClickChatHistoryOpen, this);
-	setDefaultBtn("Chat");
 }
 
 LLFloaterChat::~LLFloaterChat()

indra/newview/llfloaterchatterbox.cpp

@@ -272,7 +272,7 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
 	{
 		mTabContainer->unlockTabs();
 		// add chat history as second tab if contact window is present, first tab otherwise
-		if (getChildView("floater_my_friends"))
+		if (findChild<LLView>("floater_my_friends"))
 		{
 			// assuming contacts window is first tab, select it
 			mTabContainer->selectFirstTab();

indra/newview/llfloaterdisplayname.cpp

@@ -123,7 +123,6 @@ void LLFloaterDisplayName::onOpen()
 		getChild<LLUICtrl>("lockout_text")->setTextArg("[TIME]",
 			next_update_string_time);
 		getChild<LLUICtrl>("lockout_text")->setVisible(true);
-		getChild<LLUICtrl>("no_lockout_text")->setVisible(false);
 		getChild<LLUICtrl>("save_btn")->setEnabled(false);
 		getChild<LLUICtrl>("display_name_editor")->setEnabled(false);
 		getChild<LLUICtrl>("display_name_confirm")->setEnabled(false);
@@ -133,7 +132,6 @@ void LLFloaterDisplayName::onOpen()
 	else
 	{
 		getChild<LLUICtrl>("lockout_text")->setVisible(false);
-		getChild<LLUICtrl>("no_lockout_text")->setVisible(true);
 		getChild<LLUICtrl>("save_btn")->setEnabled(true);
 		getChild<LLUICtrl>("display_name_editor")->setEnabled(true);
 		getChild<LLUICtrl>("display_name_confirm")->setEnabled(true);

indra/newview/llfloaterenvsettings.cpp

@@ -88,7 +88,6 @@ void LLFloaterEnvSettings::initCallbacks(void)
 	// WL Top
 	childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL);
 	childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL);
-	childSetAction("EnvSubmitWindlight", onSubmitWindlight, NULL);
 	childSetAction("EnvUseEstateTimeButton", onUseEstateTime, NULL);
 	childSetAction("EnvSettingsHelpButton", onClickHelp, this);
 }
@@ -285,21 +284,6 @@ void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData)
 	LLFloaterWater::show();
 }
 
-void LLFloaterEnvSettings::onSubmitWindlight(void* userData)
-{
-	Meta7WindlightPacket * wl = new Meta7WindlightPacket();
-
-	LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance();
-	wl->reflectionWaveletScale.X = param_mgr->mNormalScale.mX;
-	wl->reflectionWaveletScale.Y = param_mgr->mNormalScale.mY;
-	wl->reflectionWaveletScale.Z = param_mgr->mNormalScale.mZ;
-
-	
-	std::vector<std::string> strings;
-	strings.push_back((char*)wl);
-	send_generic_message("Windlight", strings);
-}
-
 void LLFloaterEnvSettings::onUseEstateTime(void* userData)
 {
 	if(LLFloaterWindLight::isOpen())

indra/newview/llfloaterenvsettings.h

@@ -78,9 +78,6 @@ public:
 	/// open the advanced water settings menu
 	static void onOpenAdvancedWater(void* userData);
 
-	/// submit windlight settings to the estate
-	static void onSubmitWindlight(void* userData);
-
 	/// sync time with the server
 	static void onUseEstateTime(void* userData);
 

indra/newview/llfloatergesture.cpp

@@ -114,11 +114,11 @@ BOOL LLFloaterGesture::postBuild()
 	
 	setTitle(label);
 
-	LLScrollListCtrl* gesture_list = getChild<LLScrollListCtrl>("avatar_list");
+	LLScrollListCtrl* gesture_list = getChild<LLScrollListCtrl>("gesture_list");
 	gesture_list->setCommitCallback(boost::bind(&LLFloaterGesture::onCommitList,this));
 	gesture_list->setDoubleClickCallback(boost::bind(&LLFloaterGesture::onClickPlay,this));
 
-	childSetAction("inventory_btn", onClickInventory, this);
+	//childSetAction("inventory_btn", onClickInventory, this);
 
 	childSetAction("edit_btn", onClickEdit, this);
 
@@ -323,6 +323,7 @@ void LLFloaterGesture::buildGestureList()
 	}
 }
 
+/*
 // static
 void LLFloaterGesture::onClickInventory(void* data)
 {
@@ -336,6 +337,7 @@ void LLFloaterGesture::onClickInventory(void* data)
 	if (!inv) return;
 	inv->getPanel()->setSelection(item_id, TRUE);
 }
+*/
 
 // static
 void LLFloaterGesture::onClickPlay(void* data)

indra/newview/llfloaterproperties.cpp

@@ -62,9 +62,6 @@
 
 #include "hippogridmanager.h"
 
-// <edit>
-#include "llclipboard.h"
-// </edit>
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -166,9 +163,6 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
 	mItemID(item_id),
 	mObjectID(object_id),
 	mDirty(TRUE)
-	// <edit>
-	, mExpanded(FALSE)
-	// </edit>
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_inventory_item_properties.xml");
 
@@ -212,13 +206,6 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
 	childSetCommitCallback("RadioSaleType",&onCommitSaleType, this);
 	// "Price" label for edit
 	childSetCommitCallback("EditPrice",&onCommitSaleInfo, this);
-	// <edit>
-	childSetAction("more_btn", &onClickMore, this);
-	childSetAction("less_btn", &onClickLess, this);
-	childSetAction("copy_btn", &onClickCopy, this);
-	childSetAction("update_btn", &onClickUpdate, this);
-	setExpanded(mExpanded);
-	// </edit>
 	// The UI has been built, now fill in all the values
 	refresh();
 }
@@ -308,28 +295,6 @@ void LLFloaterProperties::draw()
 
 void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 {
-	// <edit>
-	childSetText("EditItemID", item->getUUID().asString());
-	childSetText("EditFolderID", item->getParentUUID().asString());
-	childSetText("EditGroup", item->getPermissions().getGroup().asString());
-	childSetText("EditAssetID", item->getAssetUUID().asString());
-
-	std::string type_str = LLAssetType::lookup(item->getType());
-	if(type_str.c_str() == NULL) type_str = llformat("%d", item->getType());
-	childSetText("EditType", type_str);
-	
-	std::string invtype_str = LLInventoryType::lookup(item->getInventoryType());
-	if(invtype_str.c_str() == NULL) invtype_str = llformat("%d", item->getInventoryType());
-	childSetText("EditInvType", invtype_str);
-	childSetText("EditFlags", llformat("%d", item->getFlags()));
-
-	std::ostringstream strm;
-	item->exportLegacyStream(strm, TRUE);
-	std::string str(strm.str());
-	LLStringUtil::replaceTabsWithSpaces(str, 4);
-	childSetText("item_text", str);
-	// </edit>
-
 	////////////////////////
 	// PERMISSIONS LOOKUP //
 	////////////////////////
@@ -1010,163 +975,14 @@ void LLFloaterProperties::closeByID(const LLUUID& item_id, const LLUUID &object_
 	}
 }
 
-// <edit>
-void LLFloaterProperties::onClickMore(void* user_data)
-{
-	LLFloaterProperties* floaterp = (LLFloaterProperties*)user_data;
-	if(floaterp)
-	{
-		LLMultiProperties* host = (LLMultiProperties*)floaterp->getHost();
-		if(host)
-			host->setExpanded(TRUE);
-		else
-			floaterp->setExpanded(TRUE);
-	}
-}
-
-void LLFloaterProperties::onClickLess(void* user_data)
-{
-	LLFloaterProperties* floaterp = (LLFloaterProperties*)user_data;
-	if(floaterp)
-	{
-		LLMultiProperties* host = (LLMultiProperties*)floaterp->getHost();
-		if(host)
-			host->setExpanded(FALSE);
-		else
-			floaterp->setExpanded(FALSE);
-	}
-}
-
-void LLFloaterProperties::setExpanded(BOOL expanded)
-{
-	mExpanded = expanded;
-	LLRect rect = getRect();
-	if(expanded)
-		rect.setOriginAndSize(rect.mLeft, rect.mBottom, 800, rect.getHeight());
-	else
-		rect.setOriginAndSize(rect.mLeft, rect.mBottom, 350, rect.getHeight());
-	setRect(rect);
-	childSetVisible("more_btn", !mExpanded);
-	childSetVisible("less_btn", mExpanded);
-	childSetVisible("item_text", mExpanded);
-	childSetVisible("copy_btn", mExpanded);
-	childSetVisible("update_btn", mExpanded);
-	if(getHost())
-		setCanTearOff(!expanded); // idk why it comes out ugly if expanded
-}
-
-// static
-void LLFloaterProperties::onClickCopy(void* user_data)
-{
-	LLFloaterProperties* floaterp = (LLFloaterProperties*)user_data;
-	if(floaterp)
-	{
-		LLViewerInventoryItem* item = (LLViewerInventoryItem*)floaterp->findItem();
-		if(item)
-		{
-			std::string str(floaterp->childGetValue("item_text").asString());
-			std::string::size_type pos;
-			while((pos = str.find("    ")) != std::string::npos)
-			{
-				str.replace(pos, 4, "\t");
-			}
-
-			std::istringstream strm(str);
-			LLViewerInventoryItem* temp = new LLViewerInventoryItem();
-			temp->importLegacyStream(strm);
-			std::ostringstream strm2;
-			temp->exportLegacyStream(strm2, TRUE);
-			LLWString wstr(utf8str_to_wstring(strm2.str()));
-
-			gClipboard.copyFromSubstring(wstr, 0, wstr.length());
-
-			//delete temp;
-		}
-	}
-}
-
-// static
-void LLFloaterProperties::onClickUpdate(void* user_data)
-{
-	LLFloaterProperties* floaterp = (LLFloaterProperties*)user_data;
-	if(floaterp)
-	{
-		LLViewerInventoryItem* item = (LLViewerInventoryItem*)floaterp->findItem();
-		if(item)
-		{
-			std::string str(floaterp->childGetValue("item_text").asString());
-			std::string::size_type pos;
-			while((pos = str.find("    ")) != std::string::npos)
-			{
-				str.replace(pos, 4, "\t");
-			}
-			
-			std::istringstream strm(str);
-			item->importLegacyStream(strm);
-
-			if(floaterp->mObjectID.isNull())
-			{
-				// This is in the agent's inventory.
-				item->updateServer(FALSE);
-				gInventory.updateItem(item);
-				gInventory.notifyObservers();
-
-				item->setComplete(FALSE);
-				item->fetchFromServer();
-			}
-			else
-			{
-				// This is in an object's contents.
-				LLViewerObject* object = gObjectList.findObject(floaterp->mObjectID);
-				if(object)
-				{
-					object->updateInventory(
-						item,
-						TASK_INVENTORY_ITEM_KEY,
-						false);
-					object->fetchInventoryFromServer();
-				}
-			}
-		}
-	}
-}
-// </edit>
-
 ///----------------------------------------------------------------------------
 /// LLMultiProperties
 ///----------------------------------------------------------------------------
 
 LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater(std::string("Properties"), rect)
-// <edit>
-, mExpanded(FALSE)
-// </edit>
 {
 }
 
-void LLMultiProperties::setExpanded(BOOL expanded)
-{
-	mExpanded = expanded;
-	LLRect rect = getRect();
-	LLRect tab_rect = mTabContainer->getRect();
-	if(expanded)
-	{
-		rect.setOriginAndSize(rect.mLeft, rect.mBottom, 800, rect.getHeight());
-		tab_rect.setOriginAndSize(tab_rect.mLeft, tab_rect.mBottom, 800, tab_rect.getHeight());
-	}
-	else
-	{
-		rect.setOriginAndSize(rect.mLeft, rect.mBottom, 350, rect.getHeight());
-		tab_rect.setOriginAndSize(tab_rect.mLeft, tab_rect.mBottom, 350, tab_rect.getHeight());
-	}
-	setRect(rect);
-	mTabContainer->setRect(tab_rect);
-	for (S32 i = 0; i < mTabContainer->getTabCount(); i++)
-	{
-		LLFloaterProperties* floaterp = (LLFloaterProperties*)mTabContainer->getPanelByIndex(i);
-		floaterp->setExpanded(expanded);
-	}
-}
-
 ///----------------------------------------------------------------------------
 /// Local function definitions
 ///----------------------------------------------------------------------------

indra/newview/llfloaterproperties.h

@@ -61,14 +61,6 @@ public:
 
 	static void closeByID(const LLUUID& item_id, const LLUUID& object_id);
 
-	// <edit>
-	static void onClickMore(void* user_data);
-	static void onClickLess(void* user_data);
-	static void onClickCopy(void* user_data);
-	static void onClickUpdate(void* user_data);
-	void setExpanded(BOOL expanded);
-	// </edit>
-
 	LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id);
 	virtual ~LLFloaterProperties();
 
@@ -102,9 +94,6 @@ protected:
 	LLUUID mObjectID;
 
 	BOOL	mDirty;
-	// <edit>
-	BOOL	mExpanded;
-	// </edit>
 
 	typedef std::map<LLUUID, LLFloaterProperties*, lluuid_less> instance_map;
 	static instance_map sInstances;
@@ -116,11 +105,6 @@ class LLMultiProperties : public LLMultiFloater
 {
 public:
 	LLMultiProperties(const LLRect& rect);
-	// <edit>
-	void setExpanded(BOOL expanded);
-protected:
-	BOOL mExpanded;
-	// </edit>
 };
 
 #endif // LL_LLFLOATERPROPERTIES_H

indra/newview/llfloaterreporter.cpp

@@ -270,11 +270,6 @@ void LLFloaterReporter::draw()
 void LLFloaterReporter::enableControls(BOOL enable)
 {
 	childSetEnabled("category_combo", enable);
-	// bug reports never include the chat history
-	if (mReportType != BUG_REPORT)
-	{
-		childSetEnabled("chat_check", enable);
-	}
 	childSetEnabled("screen_check",	enable);
 	childDisable("screenshot");
 	childSetEnabled("pick_btn",		enable);

indra/newview/llfloatersettingsdebug.cpp

@@ -105,7 +105,6 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	getChild<LLUICtrl>("val_spinner_4")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
 	getChild<LLUICtrl>("val_text")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
 	getChild<LLUICtrl>("boolean_combo")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	getChild<LLUICtrl>("color_swatch")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
 	getChild<LLUICtrl>("copy_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCopyToClipboard, this));
 	getChild<LLUICtrl>("default_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onClickDefault, this));
 	getChild<LLSearchEditor>("search_settings_input")->setSearchCallback(onUpdateFilter, this);

indra/newview/llfloatertools.cpp

@@ -294,8 +294,8 @@ BOOL	LLFloaterTools::postBuild()
 			llwarns << "Tool button not found! DOA Pending." << llendl;
 		}
 	}
-	mComboTreesGrass = getChild<LLComboBox>("trees_grass");
+	if ((mComboTreesGrass = findChild<LLComboBox>("trees_grass")))
-	childSetCommitCallback("trees_grass", onSelectTreesGrass, (void*)0);
+		childSetCommitCallback("trees_grass", onSelectTreesGrass, (void*)0);
 	mCheckCopySelection = getChild<LLCheckBoxCtrl>("checkbox copy selection");
 	childSetValue("checkbox copy selection",(BOOL)gSavedSettings.getBOOL("CreateToolCopySelection"));
 	mCheckSticky = getChild<LLCheckBoxCtrl>("checkbox sticky");
@@ -722,9 +722,10 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	// Create buttons
 	BOOL create_visible = (tool == LLToolCompCreate::getInstance());
 
-	mBtnCreate	->setToggleState(	tool == LLToolCompCreate::getInstance() );
+	mBtnCreate	->setToggleState(create_visible);
 
-	updateTreeGrassCombo(create_visible);
+	if (mComboTreesGrass)
+		updateTreeGrassCombo(create_visible);
 
 	if (mCheckCopySelection
 		&& mCheckCopySelection->get())

indra/newview/llfloaterwater.cpp

@@ -108,7 +108,7 @@ void LLFloaterWater::initCallbacks(void) {
 	initHelpBtn("WaterFogColorHelp", "HelpWaterFogColor");
 	initHelpBtn("WaterFogDensityHelp", "HelpWaterFogDensity");
 	initHelpBtn("WaterUnderWaterFogModHelp", "HelpUnderWaterFogMod");
-	initHelpBtn("WaterGlowHelp", "HelpWaterGlow");	
+	//initHelpBtn("WaterGlowHelp", "HelpWaterGlow");
 	initHelpBtn("WaterNormalScaleHelp", "HelpWaterNormalScale");
 	initHelpBtn("WaterFresnelScaleHelp", "HelpWaterFresnelScale");
 	initHelpBtn("WaterFresnelOffsetHelp", "HelpWaterFresnelOffset");
@@ -126,7 +126,7 @@ void LLFloaterWater::initCallbacks(void) {
 	childSetCommitCallback("WaterFogColor", onWaterFogColorMoved, &param_mgr->mFogColor);
 
 	// 
-	childSetCommitCallback("WaterGlow", onColorControlAMoved, &param_mgr->mFogColor);
+	//childSetCommitCallback("WaterGlow", onColorControlAMoved, &param_mgr->mFogColor);
 
 	// fog density
 	childSetCommitCallback("WaterFogDensity", onExpFloatControlMoved, &param_mgr->mFogDensity);
@@ -165,8 +165,8 @@ void LLFloaterWater::initCallbacks(void) {
 	childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);
 
 	// next/prev buttons
-	childSetAction("next", onClickNext, this);
+	//childSetAction("next", onClickNext, this);
-	childSetAction("prev", onClickPrev, this);
+	//childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWater::onClickHelp(void* data)
@@ -237,7 +237,7 @@ void LLFloaterWater::syncMenu()
 	param_mgr->mFogColor = current_params.getVector4(param_mgr->mFogColor.mName, err);
 
 	LLColor4 col = param_mgr->getFogColor();
-	childSetValue("WaterGlow", col.mV[3]);
+	//childSetValue("WaterGlow", col.mV[3]);
 	col.mV[3] = 1.0f;
 	LLColorSwatchCtrl* colCtrl = sWaterMenu->getChild<LLColorSwatchCtrl>("WaterFogColor");
 

indra/newview/llfloaterwindlight.cpp

@@ -222,8 +222,8 @@ void LLFloaterWindLight::initCallbacks(void) {
 	childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL);
 
 	// next/prev buttons
-	childSetAction("next", onClickNext, this);
+	//childSetAction("next", onClickNext, this);
-	childSetAction("prev", onClickPrev, this);
+	//childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWindLight::onClickHelp(void* data)
@@ -322,7 +322,7 @@ void LLFloaterWindLight::syncMenu()
 
 	// blue horizon
 	param_mgr->mBlueHorizon = cur_params.getVector(param_mgr->mBlueHorizon.mName, err);
-	setColorSwatch("WLBlueHorizon", param_mgr->mBlueHorizon, WL_BLUE_HORIZON_DENSITY_SCALE);
+	//setColorSwatch("WLBlueHorizon", param_mgr->mBlueHorizon, WL_BLUE_HORIZON_DENSITY_SCALE);
 
 	// haze density, horizon, mult, and altitude
 	param_mgr->mHazeDensity = cur_params.getFloat(param_mgr->mHazeDensity.mName, err);
@@ -336,13 +336,13 @@ void LLFloaterWindLight::syncMenu()
 
 	// blue density
 	param_mgr->mBlueDensity = cur_params.getVector(param_mgr->mBlueDensity.mName, err);
-	setColorSwatch("WLBlueDensity", param_mgr->mBlueDensity, WL_BLUE_HORIZON_DENSITY_SCALE);
+	//setColorSwatch("WLBlueDensity", param_mgr->mBlueDensity, WL_BLUE_HORIZON_DENSITY_SCALE);
 
 	// Lighting
 
 	// sunlight
 	param_mgr->mSunlight = cur_params.getVector(param_mgr->mSunlight.mName, err);
-	setColorSwatch("WLSunlight", param_mgr->mSunlight, WL_SUN_AMBIENT_SLIDER_SCALE);
+	//setColorSwatch("WLSunlight", param_mgr->mSunlight, WL_SUN_AMBIENT_SLIDER_SCALE);
 
 	// glow
 	param_mgr->mGlow = cur_params.getVector(param_mgr->mGlow.mName, err);
@@ -351,7 +351,7 @@ void LLFloaterWindLight::syncMenu()
 		
 	// ambient
 	param_mgr->mAmbient = cur_params.getVector(param_mgr->mAmbient.mName, err);
-	setColorSwatch("WLAmbient", param_mgr->mAmbient, WL_SUN_AMBIENT_SLIDER_SCALE);
+	//setColorSwatch("WLAmbient", param_mgr->mAmbient, WL_SUN_AMBIENT_SLIDER_SCALE);
 
 	childSetValue("WLSunAngle", param_mgr->mCurParams.getFloat("sun_angle",err) / F_TWO_PI);
 	childSetValue("WLEastAngle", param_mgr->mCurParams.getFloat("east_angle",err) / F_TWO_PI);
@@ -360,7 +360,7 @@ void LLFloaterWindLight::syncMenu()
 
 	// Cloud Color
 	param_mgr->mCloudColor = cur_params.getVector(param_mgr->mCloudColor.mName, err);
-	setColorSwatch("WLCloudColor", param_mgr->mCloudColor, WL_CLOUD_SLIDER_SCALE);
+	//setColorSwatch("WLCloudColor", param_mgr->mCloudColor, WL_CLOUD_SLIDER_SCALE);
 
 	// Cloud
 	param_mgr->mCloudMain = cur_params.getVector(param_mgr->mCloudMain.mName, err);

indra/newview/llfloaterworldmap.cpp

@@ -1644,11 +1644,9 @@ void LLFloaterWorldMap::onChangeMaturity()
 	bool can_access_adult = gAgent.canAccessAdult();
 	
 	childSetVisible("events_mature_icon", can_access_mature);
-	childSetVisible("events_mature_label", can_access_mature);
 	childSetVisible("event_mature_chk", can_access_mature);
 
 	childSetVisible("events_adult_icon", can_access_adult);
-	childSetVisible("events_adult_label", can_access_adult);
 	childSetVisible("event_adult_chk", can_access_adult);
 
 	// disable mature / adult events.

indra/newview/llimpanel.cpp

@@ -1356,18 +1356,25 @@ BOOL LLFloaterIMPanel::postBuild()
 		mInputEditor->setRevertOnEsc( FALSE );
 		mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 
-		childSetAction("profile_callee_btn", onClickProfile, this);
+		if (LLButton* btn = findChild<LLButton>("profile_callee_btn"))
-		childSetAction("profile_tele_btn", onClickTeleport, this);
+		{
-		childSetAction("group_info_btn", onClickGroupInfo, this);
+			btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickProfile, this));
+			if (!mProfileButtonEnabled) btn->setEnabled(false);
+		}
+		if (LLButton* btn = findChild<LLButton>("profile_tele_btn"))
+			btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickTeleport, this));
+		if (LLButton* btn = findChild<LLButton>("group_info_btn"))
+			btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickGroupInfo, this));
 		childSetAction("history_btn", onClickHistory, this);
-		childSetCommitCallback("rp_mode", onRPMode, this);
+		if (LLUICtrl* ctrl = findChild<LLUICtrl>("rp_mode"))
+			ctrl->setCommitCallback(boost::bind(&LLFloaterIMPanel::onRPMode, this, _2));
 
 		childSetAction("start_call_btn", onClickStartCall, this);
 		childSetAction("end_call_btn", onClickEndCall, this);
 		childSetAction("send_btn", onClickSend, this);
-		childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+		if (LLButton* btn = findChild<LLButton>("toggle_active_speakers_btn"))
+			btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickToggleActiveSpeakers, this, _2));
 
-		childSetAction("moderator_kick_speaker", onKickSpeaker, this);
 		//LLButton* close_btn = getChild<LLButton>("close_btn");
 		//close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
 
@@ -1380,11 +1387,6 @@ BOOL LLFloaterIMPanel::postBuild()
 			childSetEnabled("profile_btn", FALSE);
 		}
 		
-		if(!mProfileButtonEnabled)
-		{
-			childSetEnabled("profile_callee_btn", FALSE);
-		}
-
 		sTitleString = getString("title_string");
 		sTypingStartString = getString("typing_start_string");
 		sSessionStartString = getString("session_start_string");
@@ -1402,8 +1404,6 @@ BOOL LLFloaterIMPanel::postBuild()
 
 		setDefaultBtn("send_btn");
 
-		mActiveSpeakersPanel.connect(this,"active_speakers_panel");
-		mToggleActiveSpeakersBtn.connect(this,"toggle_active_speakers_btn");
 		mVolumeSlider.connect(this,"speaker_volume");
 		mEndCallBtn.connect(this,"end_call_btn");
 		mStartCallBtn.connect(this,"start_call_btn");
@@ -1496,10 +1496,11 @@ void LLFloaterIMPanel::draw()
 	// show speakers window when voice first connects
 	if (mShowSpeakersOnConnect && mVoiceChannel->isActive())
 	{
-		mActiveSpeakersPanel->setVisible(true);
+		childSetVisible("active_speakers_panel", true);
 		mShowSpeakersOnConnect = FALSE;
 	}
-	mToggleActiveSpeakersBtn->setValue(mActiveSpeakersPanel->getVisible());
+	if (LLUICtrl* ctrl = findChild<LLUICtrl>("toggle_active_speakers_btn"))
+		ctrl->setValue(getChildView("active_speakers_panel")->getVisible());
 
 	if (mTyping)
 	{
@@ -1884,37 +1885,28 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
 }
 
 
-// static
+void LLFloaterIMPanel::onClickProfile()
-void LLFloaterIMPanel::onClickProfile( void* userdata )
 {
 	//  Bring up the Profile window
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+	if (mOtherParticipantUUID.notNull())
-	
-	if (self->mOtherParticipantUUID.notNull())
 	{
-		LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
+		LLFloaterAvatarInfo::showFromDirectory(mOtherParticipantUUID);
 	}
 }
 
-//static
+void LLFloaterIMPanel::onClickTeleport()
-void LLFloaterIMPanel::onClickTeleport( void* userdata )
 {
-	//  Bring up the Profile window
+	if (mOtherParticipantUUID.notNull())
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-	
-	if (self->mOtherParticipantUUID.notNull())
 	{
-		handle_lure(self->getOtherParticipantID());
+		handle_lure(mOtherParticipantUUID);
 		//do a teleport to other part id
-		//LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
+		//LLFloaterAvatarInfo::showFromDirectory(mOtherParticipantID);
 	}
 }
 
-// static
+void LLFloaterIMPanel::onRPMode(const LLSD& value)
-void LLFloaterIMPanel::onRPMode(LLUICtrl* source, void* user_data)
 {
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*) user_data;
+	mRPMode = value.asBoolean();
-	self->mRPMode = source->getValue().asBoolean();
 }
 
 // static
@@ -1936,13 +1928,10 @@ void LLFloaterIMPanel::onClickHistory( void* userdata )
 	}
 }
 
-// static
+void LLFloaterIMPanel::onClickGroupInfo()
-void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 {
 	//  Bring up the Profile window
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+	LLFloaterGroupInfo::showFromUUID(mSessionUUID);
-
-	LLFloaterGroupInfo::showFromUUID(self->mSessionUUID);
 }
 
 // static
@@ -1978,12 +1967,9 @@ void LLFloaterIMPanel::onClickSend(void* userdata)
 	self->sendMsg();
 }
 
-// static
+void LLFloaterIMPanel::onClickToggleActiveSpeakers(const LLSD& value)
-void LLFloaterIMPanel::onClickToggleActiveSpeakers(void* userdata)
 {
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata;
+	childSetVisible("active_speakers_panel", value);
-
-	self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
 }
 
 // static
@@ -2596,12 +2582,6 @@ void LLFloaterIMPanel::showSessionForceClose(
 
 }
 
-//static 
-void LLFloaterIMPanel::onKickSpeaker(void* user_data)
-{
-
-}
-
 bool LLFloaterIMPanel::onConfirmForceCloseError(const LLSD& notification, const LLSD& response)
 {
 	//only 1 option really

indra/newview/llimpanel.h

@@ -237,18 +237,17 @@ public:
 	static void		onCommitChat(LLUICtrl* caller, void* userdata);
 	static void		onTabClick( void* userdata );
 
-	static void		onClickProfile( void* userdata );
+	void			onClickProfile();
 	static void		onClickHistory( void* userdata );
-	static void		onRPMode(LLUICtrl* source, void* user_data);
+	void			onRPMode(const LLSD& value);
-	static void		onClickTeleport( void* userdata );
+	void			onClickTeleport();
-	static void		onClickGroupInfo( void* userdata );
+	void			onClickGroupInfo();
 	static void		onClickClose( void* userdata );
 	static void		onClickStartCall( void* userdata );
 	static void		onClickEndCall( void* userdata );
 	static void		onClickSend( void* userdata );
-	static void		onClickToggleActiveSpeakers( void* userdata );
+	void			onClickToggleActiveSpeakers(const LLSD& value);
 	static void*	createSpeakersPanel(void* data);
-	static void		onKickSpeaker(void* user_data);
 
 	//callbacks for P2P muting and volume control
 	static void onClickMuteVoice(void* user_data);
@@ -385,8 +384,6 @@ private:
 	boost::signals2::connection mFocusLostSignal;
 
 
-	CachedUICtrl<LLPanel> mActiveSpeakersPanel;
-	CachedUICtrl<LLButton> mToggleActiveSpeakersBtn;
 	CachedUICtrl<LLUICtrl> mVolumeSlider;
 	CachedUICtrl<LLButton> mEndCallBtn;
 	CachedUICtrl<LLButton> mStartCallBtn;

indra/newview/llpanelavatar.cpp

@@ -1571,17 +1571,17 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 	if(gAgent.isGodlike())
 	{
 		childSetEnabled("Offer Teleport...", TRUE);
-		childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
+		childSetToolTip("Offer Teleport...", getString("TeleportGod"));
 	}
 	else if (in_prelude)
 	{
 		childSetEnabled("Offer Teleport...",FALSE);
-		childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
+		childSetToolTip("Offer Teleport...", getString("TeleportPrelude"));
 	}
 	else
 	{
 		childSetEnabled("Offer Teleport...", TRUE /*(online_status == ONLINE_STATUS_YES)*/);
-		childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
+		childSetToolTip("Offer Teleport...", getString("TeleportNormal"));
 	}
 }
 
@@ -1759,15 +1759,15 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 			childSetEnabled("Find on Map",enable_track);
 			if (!mIsFriend)
 			{
-				childSetToolTip("Find on Map",childGetValue("ShowOnMapNonFriend").asString());
+				childSetToolTip("Find on Map", getString("ShowOnMapNonFriend"));
 			}
 			else if (ONLINE_STATUS_YES != online_status)
 			{
-				childSetToolTip("Find on Map",childGetValue("ShowOnMapFriendOffline").asString());
+				childSetToolTip("Find on Map", getString("ShowOnMapFriendOffline"));
 			}
 			else
 			{
-				childSetToolTip("Find on Map",childGetValue("ShowOnMapFriendOnline").asString());
+				childSetToolTip("Find on Map", getString("ShowOnMapFriendOnline"));
 			}
 			childSetVisible("Add Friend...", true);
 			childSetEnabled("Add Friend...", !avatar_is_friend);

indra/newview/llpaneldisplay.cpp

@@ -107,9 +107,6 @@ BOOL LLPanelDisplay::postBuild()
 	// return to default values
 	childSetAction("Defaults", setHardwareDefaults, NULL);
 	
-	// Help button
-	childSetAction("GraphicsPreferencesHelpButton", onOpenHelp, this);
-
 	//============================================================================
 	// Resolution
 	
@@ -120,7 +117,6 @@ BOOL LLPanelDisplay::postBuild()
 	mCtrlWindowed->setCallbackUserData(this);
 
 	mAspectRatioLabel1 = getChild<LLTextBox>("AspectRatioLabel1");
-	mFullScreenInfo = getChild<LLTextEditor>("FullScreenInfo");
 	mDisplayResLabel = getChild<LLTextBox>("DisplayResLabel");
 
 	S32 num_resolutions = 0;
@@ -218,7 +214,7 @@ BOOL LLPanelDisplay::postBuild()
 	mCtrlCustomSettings->setCommitCallback(onChangeCustom);
 	mCtrlCustomSettings->setCallbackUserData(this);
 
-	mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
+	//mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
 
 	// Enable Transparent Water
 	mCtrlTransparentWater = getChild<LLCheckBoxCtrl>("TransparentWater");
@@ -350,7 +346,6 @@ BOOL LLPanelDisplay::postBuild()
 	mReflectionText = getChild<LLTextBox>("ReflectionDetailText");
 	mAvatarText = getChild<LLTextBox>("AvatarRenderingText");
 	mTerrainText = getChild<LLTextBox>("TerrainDetailText");
-	mLightingText = getChild<LLTextBox>("LightingDetailText");
 	mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 	mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
 	mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
@@ -486,7 +481,6 @@ void LLPanelDisplay::refreshEnabledState()
 	mCtrlAspectRatio->setVisible(isFullScreen);
 	mAspectRatioLabel1->setVisible(isFullScreen);
 	mCtrlAutoDetectAspect->setVisible(isFullScreen);
-	mFullScreenInfo->setVisible(!isFullScreen);
 	mWindowSizeLabel->setVisible(!isFullScreen);
 	mCtrlWindowSize->setVisible(!isFullScreen);
 
@@ -713,7 +707,7 @@ void LLPanelDisplay::disableUnavailableSettings()
 void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 {
 	// quick check
-	llassert(mGraphicsBorder != NULL);
+	//llassert(mGraphicsBorder != NULL);
 
 	llassert(mCtrlDrawDistance != NULL);
 	llassert(mCtrlLODFactor != NULL);
@@ -753,13 +747,12 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	llassert(mReflectionText != NULL);
 	llassert(mTerrainScaleText != NULL);
 	llassert(mAvatarText != NULL);
-	llassert(mLightingText != NULL);
 	llassert(mTerrainText != NULL);
 	llassert(mDrawDistanceMeterText1 != NULL);
 	llassert(mDrawDistanceMeterText2 != NULL);
 
 	// enable/disable the states
-	mGraphicsBorder->setVisible(!isHidden);
+	//mGraphicsBorder->setVisible(!isHidden);
 	/* 
 	LLColor4 light(.45098f, .51765f, .6078f, 1.0f);
 	LLColor4 dark(.10196f, .10196f, .10196f, 1.0f);
@@ -809,7 +802,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	mShaderText->setVisible(!isHidden);
 	mReflectionText->setVisible(!isHidden);
 	mAvatarText->setVisible(!isHidden);
-	mLightingText->setVisible(!isHidden);
 	mTerrainText->setVisible(!isHidden);
 	mDrawDistanceMeterText1->setVisible(!isHidden);
 	mDrawDistanceMeterText2->setVisible(!isHidden);
@@ -930,15 +922,6 @@ void LLPanelDisplay::onChangeCustom(LLUICtrl *ctrl, void *data)
 	LLFloaterPreference::refreshEnabledGraphics();
 }
 
-void LLPanelDisplay::onOpenHelp(void* user_data)
-{
-	LLPanelDisplay* self = static_cast<LLPanelDisplay*>(user_data);
-
-	const char* xml_alert = "GraphicsPreferencesHelp";
-	LLFloater* parent_floater = gFloaterView->getParentFloater(self);
-	LLNotifications::instance().add(parent_floater->contextualNotification(xml_alert));
-}
-
 void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
 {
 	((LLPanelDisplay*) src)->applyResolution();

indra/newview/llpaneldisplay.h

@@ -93,7 +93,7 @@ protected:
 	LLCheckBoxCtrl	*mCtrlCustomSettings;
 
 	// performance sliders and boxes
-	LLViewBorder	*mGraphicsBorder;
+	//LLViewBorder	*mGraphicsBorder;
 
 	LLSliderCtrl	*mCtrlDrawDistance;				// the draw distance slider
 	LLSliderCtrl	*mCtrlLODFactor;				// LOD for volume objects
@@ -125,14 +125,12 @@ protected:
 
 	LLTextBox		*mAspectRatioLabel1;
 	LLTextBox		*mDisplayResLabel;
-	LLTextEditor	*mFullScreenInfo;
 	LLTextBox       *mWindowSizeLabel;
 	
 	LLTextBox		*mShaderText;
 	LLTextBox		*mReflectionText;
 	LLTextBox		*mAvatarText;
 	LLTextBox		*mTerrainText;
-	LLTextBox		*mLightingText;
 	LLTextBox		*mDrawDistanceMeterText1;
 	LLTextBox		*mDrawDistanceMeterText2;
 
@@ -203,7 +201,6 @@ protected:
 	// if the custom settings box is clicked
 	static void onChangeCustom(LLUICtrl *ctrl, void *data);
 	
-	static void onOpenHelp(void *data);
 	static void onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data);
 	static void onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data);
 	static void onSelectAspectRatio(LLUICtrl*, void*);

indra/newview/llpanelobject.cpp

@@ -145,7 +145,7 @@ BOOL	LLPanelObject::postBuild()
 	//--------------------------------------------------------
 	
 	// Build constant tipsheet
-	childSetAction("build_math_constants",onClickBuildConstants,this);
+	//childSetAction("build_math_constants",onClickBuildConstants,this);
 
 	// Lock checkbox
 	mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
@@ -471,7 +471,6 @@ void LLPanelObject::getState( )
 	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
 	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
-	childSetEnabled("build_math_constants",true);
 	S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 	BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
 						 && (selected_count == 1);
@@ -2295,8 +2294,6 @@ void LLPanelObject::clearCtrls()
 	childSetEnabled("advanced_cut", FALSE);
 	childSetEnabled("advanced_dimple", FALSE);
 	childSetVisible("advanced_slice", FALSE);
-
-	childSetEnabled("build_math_constants",false);
 }
 
 //

indra/newview/llprefschat.cpp

@@ -73,8 +73,6 @@ private:
 	BOOL mScriptErrorAsChat;
 	F32	mConsoleOpacity;
 	F32	mBubbleOpacity;
-	std::string mTranslateLanguage;
-	BOOL mTranslateChat;
 };
 
 
@@ -109,8 +107,6 @@ LLPrefsChatImpl::LLPrefsChatImpl()
 	childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
 	childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
 	childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
-	childSetValue("translate_language_combobox", 	gSavedSettings.getString("TranslateLanguage"));
-	childSetValue("translate_chat", 	gSavedSettings.getBOOL("TranslateChat"));
 }
 
 void LLPrefsChatImpl::refreshValues()
@@ -137,8 +133,6 @@ void LLPrefsChatImpl::refreshValues()
 	mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
 	mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
 	mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
-	mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
-	mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
 }
 
 void LLPrefsChatImpl::cancel()
@@ -164,8 +158,6 @@ void LLPrefsChatImpl::cancel()
 	gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
 	gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
 	gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);	
-	gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);	
-	gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
 }
 
 void LLPrefsChatImpl::apply()
@@ -197,9 +189,6 @@ void LLPrefsChatImpl::apply()
 	gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
 	gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 
-	gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
-	gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
-
 	refreshValues(); // member values become the official values and cancel becomes a no-op.
 }
 

indra/newview/llstatusbar.cpp

@@ -197,9 +197,7 @@ mSquareMetersCommitted(0)
 	mSGBandwidth = new LLStatGraph("BandwidthGraph", r);
 	mSGBandwidth->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
 	mSGBandwidth->setStat(&LLViewerStats::getInstance()->mKBitStat);
-	std::string text = childGetText("bandwidth_tooltip") + " ";
+	mSGBandwidth->setLabel(getString("bandwidth_tooltip") + " ");
-	LLUIString bandwidth_tooltip = text;	// get the text from XML until this widget is XML driven
-	mSGBandwidth->setLabel(bandwidth_tooltip.getString());
 	mSGBandwidth->setUnits("Kbps");
 	mSGBandwidth->setPrecision(0);
 	mSGBandwidth->setMouseOpaque(FALSE);
@@ -210,9 +208,7 @@ mSquareMetersCommitted(0)
 	mSGPacketLoss = new LLStatGraph("PacketLossPercent", r);
 	mSGPacketLoss->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
 	mSGPacketLoss->setStat(&LLViewerStats::getInstance()->mPacketsLostPercentStat);
-	text = childGetText("packet_loss_tooltip") + " ";
+	mSGPacketLoss->setLabel(getString("packet_loss_tooltip") + " ");
-	LLUIString packet_loss_tooltip = text;	// get the text from XML until this widget is XML driven
-	mSGPacketLoss->setLabel(packet_loss_tooltip.getString());
 	mSGPacketLoss->setUnits("%");
 	mSGPacketLoss->setMin(0.f);
 	mSGPacketLoss->setMax(5.f);

indra/newview/lltoolbar.cpp

@@ -132,8 +132,8 @@ BOOL LLToolBar::postBuild()
 	childSetAction("chat_btn", onClickChat, this);
 	childSetControlName("chat_btn", "ChatVisible");
 
-	childSetAction("appearance_btn", onClickAppearance, this);
+	//childSetAction("appearance_btn", onClickAppearance, this);
-	childSetControlName("appearance_btn", "");
+	//childSetControlName("appearance_btn", "");
 
 	childSetAction("radar_list_btn", onClickRadarList, this);
 	childSetControlName("radar_list_btn", "ShowRadar");
@@ -141,8 +141,8 @@ BOOL LLToolBar::postBuild()
 	childSetAction("fly_btn", onClickFly, this);
 	childSetControlName("fly_btn", "FlyBtnState");
 
-	childSetAction("sit_btn", onClickSit, this);
+	//childSetAction("sit_btn", onClickSit, this);
-	childSetControlName("sit_btn", "SitBtnState");
+	//childSetControlName("sit_btn", "SitBtnState");
 
 	childSetAction("snapshot_btn", onClickSnapshot, this);
 	childSetControlName("snapshot_btn", "SnapshotBtnState");
@@ -167,7 +167,7 @@ BOOL LLToolBar::postBuild()
 	mBuildBtn.connect(this, "build_btn");
 	mMapBtn.connect(this, "map_btn");
 	mRadarBtn.connect(this, "radar_btn");
-	mInventoryBtn.connect(this, "inventory_button");
+	mInventoryBtn.connect(this, "inventory_btn");
 
 	for (child_list_const_iter_t child_iter = getChildList()->begin();
 		 child_iter != getChildList()->end(); ++child_iter)

indra/newview/llviewermenu.cpp

@@ -800,11 +800,8 @@ void init_menus()
 	gMenuHolder->childSetLabelArg("Upload Sound", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Upload Animation", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Bulk Upload", "[UPLOADFEE]", fee);
-	gMenuHolder->childSetLabelArg("ImportUpload", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Buy and Sell L$...", "[CURRENCY]",
 		gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
-	gMenuHolder->childSetLabelArg("Reload Balance", "[CURRENCY]",
-		gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
 	gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
 	gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE);

indra/newview/llviewermessage.cpp

@@ -6477,7 +6477,6 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 	gMenuHolder->childSetLabelArg("Upload Sound", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Upload Animation", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Bulk Upload", "[UPLOADFEE]", fee);
-	gMenuHolder->childSetLabelArg("ImportUpload", "[UPLOADFEE]", fee);
 	gMenuHolder->childSetLabelArg("Buy and Sell L$...", "[CURRENCY]",
 		gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 }

indra/newview/llvoiceremotectrl.cpp

@@ -80,21 +80,19 @@ BOOL LLVoiceRemoteCtrl::postBuild()
 	mSpeakersBtn->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onClickSpeakers));
 
 	childSetAction("show_channel", onClickPopupBtn, this);
-	childSetAction("end_call_btn", onClickEndCall, this);
+	if (LLButton* end_call_btn = findChild<LLButton>("end_call_btn"))
+		end_call_btn->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onClickEndCall));
 
-	LLTextBox* text = getChild<LLTextBox>("channel_label");
+	LLTextBox* text = findChild<LLTextBox>("channel_label");
 	if (text)
 	{
 		text->setUseEllipses(TRUE);
 	}
 
-	childSetAction("voice_channel_bg", onClickVoiceChannel, this);
+	if (LLButton* voice_channel_bg = findChild<LLButton>("voice_channel_bg"))
+		voice_channel_bg->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onClickVoiceChannel));
 
-	mEndCallBtn.connect(this,"end_call_btn");
 	mVoiceVolIcon.connect(this,"voice_volume");
-	mVoiceChanIcon.connect(this,"voice_channel_icon");
-	mVoiceChanBgBtn.connect(this,"voice_channel_bg");
-	mChanLabelTextBox.connect(this,"channel_label");
 	mShowChanBtn.connect(this,"show_channel");
 	return TRUE;
 }
@@ -168,23 +166,25 @@ void LLVoiceRemoteCtrl::draw()
 	}
 
 	LLVoiceChannel* current_channel = LLVoiceChannel::getCurrentVoiceChannel();
-	mEndCallBtn->setEnabled(LLVoiceClient::voiceEnabled() 
+	if (LLButton* end_call_btn = findChild<LLButton>("end_call_btn"))
+		end_call_btn->setEnabled(LLVoiceClient::voiceEnabled()
 								&& current_channel
 								&& current_channel->isActive()
 								&& current_channel != LLVoiceChannelProximal::getInstance());
 
-	mChanLabelTextBox->setValue(active_channel_name);
+	if (LLTextBox* text = findChild<LLTextBox>("channel_label"))
-	mVoiceChanBgBtn->setToolTip(active_channel_name);
+		text->setValue(active_channel_name);
+	LLButton* voice_channel_bg = findChild<LLButton>("voice_channel_bg");
+	if (voice_channel_bg) voice_channel_bg->setToolTip(active_channel_name);
 
 	if (current_channel)
 	{
-		LLIconCtrl* voice_channel_icon = mVoiceChanIcon;
+		LLIconCtrl* voice_channel_icon = findChild<LLIconCtrl>("voice_channel_icon");
 		if (voice_channel_icon && voice_floater)
 		{
 			voice_channel_icon->setImage(voice_floater->getString("voice_icon"));
 		}
 
-		LLButton* voice_channel_bg = mVoiceChanBgBtn;
 		if (voice_channel_bg)
 		{
 			LLColor4 bg_color;
@@ -272,7 +272,7 @@ void LLVoiceRemoteCtrl::onClickPopupBtn(void* user_data)
 }
 
 //static
-void LLVoiceRemoteCtrl::onClickEndCall(void* user_data)
+void LLVoiceRemoteCtrl::onClickEndCall()
 {
 	LLVoiceChannel* current_channel = LLVoiceChannel::getCurrentVoiceChannel();
 
@@ -289,7 +289,7 @@ void LLVoiceRemoteCtrl::onClickSpeakers()
 }
 
 //static 
-void LLVoiceRemoteCtrl::onClickVoiceChannel(void* user_data)
+void LLVoiceRemoteCtrl::onClickVoiceChannel()
 {
 	LLFloaterChatterBox::showInstance();
 }

indra/newview/llvoiceremotectrl.h

@@ -54,18 +54,14 @@ public:
 	static void onBtnTalkClicked();
 	static void onClickSpeakers();
 	static void onClickPopupBtn(void* user_data);
-	static void onClickVoiceChannel(void* user_data);
+	static void onClickVoiceChannel();
-	static void onClickEndCall(void* user_data);
+	static void onClickEndCall();
 
 protected:
 	LLButton* mTalkBtn;
 	LLButton* mTalkLockBtn;
 	LLButton* mSpeakersBtn;
-	CachedUICtrl<LLButton> mEndCallBtn;
 	CachedUICtrl<LLIconCtrl> mVoiceVolIcon;
-	CachedUICtrl<LLIconCtrl> mVoiceChanIcon;
-	CachedUICtrl<LLButton> mVoiceChanBgBtn;
-	CachedUICtrl<LLTextBox> mChanLabelTextBox;
 	CachedUICtrl<LLButton> mShowChanBtn;
 };
 

indra/newview/skins/default/xui/en-us/floater_customize.xml

@@ -133,6 +133,7 @@ scratch and wear it.
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save As..." label_selected="Save As..." left="209"
 			     mouse_opaque="true" name="Save As" scale_image="true" width="92" />
+      <button name="Take Off"/>
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
 		     label="Skin" left="102" mouse_opaque="true" name="Skin" width="389">
@@ -227,6 +228,7 @@ scratch and wear it.
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Revert" label_selected="Revert" left="305"
 			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+      <button name="Take Off"/>
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
 		     label="Hair" left="102" mouse_opaque="true" name="Hair" width="389">
@@ -313,6 +315,7 @@ scratch and wear it.
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Revert" label_selected="Revert" left="305"
 			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+      <button name="Take Off"/>
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
 		     label="Eyes" left="102" mouse_opaque="true" name="Eyes" width="389">
@@ -387,6 +390,7 @@ scratch and wear it.
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Revert" label_selected="Revert" left="305"
 			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+      <button name="Take Off"/>
     </panel>
     <panel label="Clothes" placeholder="true" name="clothes_placeholder" />
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"

indra/newview/wlfPanel_AdvSettings.cpp

@@ -59,7 +59,6 @@
 
 BOOL firstBuildDone;
 void* fixPointer;
-std::string ButtonState;
 
 wlfPanel_AdvSettings::wlfPanel_AdvSettings()
 {
@@ -70,6 +69,7 @@ wlfPanel_AdvSettings::wlfPanel_AdvSettings()
 void wlfPanel_AdvSettings::build()
 {
 	deleteAllChildren();
+	std::string ButtonState;
 	if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
 	{
 		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings_expanded.xml", &getFactoryMap());
@@ -80,20 +80,22 @@ void wlfPanel_AdvSettings::build()
 		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings.xml", &getFactoryMap());
 		ButtonState = "arrow_down.tga";
 	}
+	getChild<LLButton>("expand")->setImageOverlay(ButtonState);
 }
 
 void wlfPanel_AdvSettings::refresh()
 {
 // [RLVa:KB] - Checked: 2009-09-19
-	if ( (rlv_handler_t::isEnabled()) && (gSavedSettings.getBOOL("wlfAdvSettingsPopup")) )
+	if (rlv_handler_t::isEnabled() && !gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
 	{
+		if (!findChild<LLView>("use_estate_wl")) return; // Singu Note: Not certain why, but sometimes none of these exist even though the above setting implies they should
 		childSetEnabled("use_estate_wl", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("EnvAdvancedWaterButton", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
-		childSetEnabled("WWPresetsCombo", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+		childSetEnabled("WLWaterPresetsCombo", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("WWprev", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("WWnext", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("EnvAdvancedSkyButton", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
-		childSetEnabled("WLPresetsCombo", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+		childSetEnabled("WLSkyPresetsCombo", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("WLprev", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("WLnext", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
 		childSetEnabled("EnvTimeSlider", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
@@ -143,38 +145,41 @@ BOOL wlfPanel_AdvSettings::postBuild()
 {
 	childSetAction("expand", onClickExpandBtn, this);
 
-	getChild<LLCheckBoxCtrl>("use_estate_wl")->setCommitCallback(onUseRegionSettings);
+	if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
+	{
+		getChild<LLCheckBoxCtrl>("use_estate_wl")->setCommitCallback(onUseRegionSettings);
 
-	mWaterPresetCombo = getChild<LLComboBox>("WLWaterPresetsCombo");
+		mWaterPresetCombo = getChild<LLComboBox>("WLWaterPresetsCombo");
-	mWaterPresetCombo->setCommitCallback(onChangeWWPresetName);
+		mWaterPresetCombo->setCommitCallback(onChangeWWPresetName);
 
-	mSkyPresetCombo = getChild<LLComboBox>("WLSkyPresetsCombo");
+		mSkyPresetCombo = getChild<LLComboBox>("WLSkyPresetsCombo");
-	mSkyPresetCombo->setCommitCallback(onChangeWLPresetName);
+		mSkyPresetCombo->setCommitCallback(onChangeWLPresetName);
 
-	// mDayCyclePresetCombo = getChild<LLComboBox>("DCPresetsCombo");
+		// mDayCyclePresetCombo = getChild<LLComboBox>("DCPresetsCombo");
-	// mDayCyclePresetCombo->setCommitCallback(onChangeDCPresetName);
+		// mDayCyclePresetCombo->setCommitCallback(onChangeDCPresetName);
 
-	LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this));
+		LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this));
-	LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this));
+		LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this));
-	LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this));
+		LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this));
-	// LLDayCycleManager::instance().setModifyCallback(boost::bind(&wlfPanel_AdvSettings::populateDayCyclePresetsList, this));
+		// LLDayCycleManager::instance().setModifyCallback(boost::bind(&wlfPanel_AdvSettings::populateDayCyclePresetsList, this));
 
-	populateWaterPresetsList();
+		populateWaterPresetsList();
-	populateSkyPresetsList();
+		populateSkyPresetsList();
-	//populateDayCyclePresetsList();
+		//populateDayCyclePresetsList();
 
-	// next/prev buttons
+		// next/prev buttons
-	childSetAction("WWnext", onClickWWNext, this);
+		childSetAction("WWnext", onClickWWNext, this);
-	childSetAction("WWprev", onClickWWPrev, this);
+		childSetAction("WWprev", onClickWWPrev, this);
-	childSetAction("WLnext", onClickWLNext, this);
+		childSetAction("WLnext", onClickWLNext, this);
-	childSetAction("WLprev", onClickWLPrev, this);
+		childSetAction("WLprev", onClickWLPrev, this);
 
-	childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL);
+		childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL);
-	childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL);
+		childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL);
 
-	mTimeSlider = getChild<LLSliderCtrl>("EnvTimeSlider");
+		mTimeSlider = getChild<LLSliderCtrl>("EnvTimeSlider");
-	mTimeSlider->setCommitCallback(onChangeDayTime);
+		mTimeSlider->setCommitCallback(onChangeDayTime);
-	updateTimeSlider();
+		updateTimeSlider();
+	}
 	
 	fixPointer = this;
 	return TRUE;
@@ -182,19 +187,6 @@ BOOL wlfPanel_AdvSettings::postBuild()
 
 void wlfPanel_AdvSettings::draw()
 {
-	LLButton* expand_button = getChild<LLButton>("expand");
-/*	if (expand_button)
-	{
-		if (expand_button->getToggleState())
-		{
-			expand_button->setImageOverlay("arrow_down.tga");
-		}
-		else
-		{
-			expand_button->setImageOverlay("arrow_up.tga");
-		}
-	} */
-			expand_button->setImageOverlay(ButtonState);
 	refresh();
 	LLPanel::draw();
 }