From 4da47de90c43111fbaba8fd17357cceadf1b9995 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 12 Jul 2013 18:43:59 -0400 Subject: [PATCH] Sync with upstream, improve RLVa and make use of the callback registrar --- indra/newview/llfloateravatarpicker.cpp | 69 ++++++++----------- indra/newview/llfloaterbulkpermission.cpp | 40 +++++------ indra/newview/llfloaterbulkpermission.h | 16 ++--- .../newview/llfloaternotificationsconsole.cpp | 32 +++++---- indra/newview/llfloaternotificationsconsole.h | 6 +- .../newview/llfloaterpathfindinglinksets.cpp | 36 +++++----- indra/newview/llfloaterpathfindingobjects.cpp | 22 +++--- indra/newview/llfloatersettingsdebug.cpp | 19 ++--- .../default/xui/en-us/floater_bulk_perms.xml | 30 ++++++-- .../en-us/floater_notifications_console.xml | 8 ++- .../xui/en-us/floater_settings_debug.xml | 41 ++++++++--- 11 files changed, 175 insertions(+), 144 deletions(-) diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 05dc86a86..dec0a2ef7 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -36,6 +36,9 @@ #include "llviewercontrol.h" #include "llviewerregion.h" // getCapability() #include "llworld.h" +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.2a) +#include "rlvhandler.h" +// [/RLVa:KB] // Linden libraries #include "llavatarnamecache.h" // IDEVO @@ -48,9 +51,6 @@ #include "lluictrlfactory.h" #include "message.h" -// [RLVa:KB] -#include "rlvhandler.h" -// [/RLVa:KB] //put it back as a member once the legacy path is out? static std::map sAvatarNameMap; @@ -82,12 +82,13 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(select_callback_t callback, } // Default constructor -LLFloaterAvatarPicker::LLFloaterAvatarPicker() : - LLFloater(), +LLFloaterAvatarPicker::LLFloaterAvatarPicker() + : LLFloater(), mNumResultsReturned(0), mNearMeListComplete(FALSE), mCloseOnSelect(FALSE) { + mCommitCallbackRegistrar.add("Refresh.FriendList", boost::bind(&LLFloaterAvatarPicker::populateFriend, this)); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml", NULL); } @@ -112,7 +113,6 @@ BOOL LLFloaterAvatarPicker::postBuild() LLScrollListCtrl* friends = getChild("Friends"); friends->setDoubleClickCallback(boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this)); - childSetAction("RefreshFriends", boost::bind(&LLFloaterAvatarPicker::populateFriend, this)); getChild("Friends")->setCommitCallback(boost::bind(&LLFloaterAvatarPicker::onList, this)); childSetAction("ok_btn", boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this)); @@ -131,7 +131,7 @@ BOOL LLFloaterAvatarPicker::postBuild() getChild("SearchResults")->setCommentText(getString("no_results")); getChild("ResidentChooserTabs")->setCommitCallback( - boost::bind(&LLFloaterAvatarPicker::onTabChanged,this)); + boost::bind(&LLFloaterAvatarPicker::onTabChanged, this)); setAllowMultiple(FALSE); @@ -200,7 +200,6 @@ static void getSelectedAvatarData(const LLUICtrl* from, uuid_vec_t& avatar_ids, addAvatarUUID(from->getValue().asUUID(), avatar_ids, avatar_names); } - void LLFloaterAvatarPicker::onBtnSelect() { @@ -272,6 +271,22 @@ void LLFloaterAvatarPicker::onRangeAdjust() void LLFloaterAvatarPicker::onList() { getChildView("ok_btn")->setEnabled(isSelectBtnEnabled()); + +// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.2a) | Modified: RLVa-1.2.0d + if (rlv_handler_t::isEnabled()) + { + LLTabContainer* pTabs = getChild("ResidentChooserTabs"); + LLPanel* pNearMePanel = getChild("NearMePanel"); + RLV_ASSERT( (pTabs) && (pNearMePanel) ); + if ( (pTabs) && (pNearMePanel) ) + { + bool fRlvEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES); + pTabs->enableTabButton(pTabs->getIndexForPanel(pNearMePanel), fRlvEnable); + if ( (!fRlvEnable) && (pTabs->getCurrentPanel() == pNearMePanel) ) + pTabs->selectTabByName("SearchPanel"); + } + } +// [/RLVa:KB] } void LLFloaterAvatarPicker::populateNearMe() @@ -365,31 +380,7 @@ void LLFloaterAvatarPicker::draw() } LLFloater::draw(); - -// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e - // TODO-RLVa: this code needs revisiting - if (rlv_handler_t::isEnabled()) - { - LLPanel* pNearMePanel = getChild("NearMePanel"); - if ( (pNearMePanel) && (childGetVisibleTab("ResidentChooserTabs") == pNearMePanel) ) - { - if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) - { - if (mNearMeListComplete) - { - getChild("NearMe")->deleteAllItems(); - childSetEnabled("Select", false); - } - mNearMeListComplete = FALSE; - pNearMePanel->setCtrlsEnabled(FALSE); - return; - } - pNearMePanel->setCtrlsEnabled(TRUE); - } - } -// [/RLVa:KB] - - if (!mNearMeListComplete && getChild("ResidentChooserTabs")->getCurrentPanel() == getChild("NearMePanel")) + if (!mNearMeListComplete && getChild("ResidentChooserTabs")->getCurrentPanel() == getChild("NearMePanel")) { populateNearMe(); } @@ -426,7 +417,7 @@ public: LLUUID mQueryID; LLAvatarPickerResponder(const LLUUID& id) : mQueryID(id) { } - + /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content) { //std::ostringstream ss; @@ -444,8 +435,7 @@ public: } else { - llinfos << "avatar picker failed " << status - << " reason " << reason << llendl; + llwarns << "avatar picker failed " << status << " reason " << reason << llendl; } } @@ -606,7 +596,7 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void* if(!instanceExists()) return; - LLFloaterAvatarPicker *floater = getInstance(); + LLFloaterAvatarPicker* floater = getInstance(); // floater is closed or these are not results from our last request if (NULL == floater || query_id != floater->mQueryID) @@ -761,6 +751,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() std::string active_panel_name; LLUICtrl* list = NULL; LLPanel* active_panel = getChild("ResidentChooserTabs")->getCurrentPanel(); + if(active_panel) { active_panel_name = active_panel->getName(); @@ -784,8 +775,8 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() if(list) { - uuid_vec_t avatar_ids; - std::vector avatar_names; + uuid_vec_t avatar_ids; + std::vector avatar_names; getSelectedAvatarData(list, avatar_ids, avatar_names); return mOkButtonValidateSignal(avatar_ids); } diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index 5359d8262..bed9fea81 100644 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -35,9 +35,9 @@ #include "llviewerprecompiledheaders.h" #include "llfloaterbulkpermission.h" #include "llfloaterperms.h" // for utilities -#include "llinventorydefines.h" #include "llagent.h" #include "llchat.h" +#include "llinventorydefines.h" #include "llviewerwindow.h" #include "llviewerobject.h" #include "llviewerobjectlist.h" @@ -49,7 +49,6 @@ #include "llresmgr.h" #include "llbutton.h" #include "lldir.h" -#include "llfloaterchat.h" #include "llviewerstats.h" #include "lluictrlfactory.h" #include "llselectmgr.h" @@ -59,17 +58,19 @@ #include "roles_constants.h" // for GP_OBJECT_MANIPULATE -LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed) : mDone(FALSE) +LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed) +: LLFloater(), + mDone(FALSE) { mID.generate(); + mCommitCallbackRegistrar.add("BulkPermission.Help", boost::bind(LLFloaterBulkPermission::onHelpBtn)); + mCommitCallbackRegistrar.add("BulkPermission.Apply", boost::bind(&LLFloaterBulkPermission::onApplyBtn, this)); + mCommitCallbackRegistrar.add("BulkPermission.Close", boost::bind(&LLFloaterBulkPermission::onCloseBtn, this)); + mCommitCallbackRegistrar.add("BulkPermission.CheckAll", boost::bind(&LLFloaterBulkPermission::onCheckAll, this)); + mCommitCallbackRegistrar.add("BulkPermission.UncheckAll", boost::bind(&LLFloaterBulkPermission::onUncheckAll, this)); + mCommitCallbackRegistrar.add("BulkPermission.CommitCopy", boost::bind(&LLFloaterBulkPermission::onCommitCopy, this)); LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml"); childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("BulkChangeNextOwnerCopy")); - childSetAction("help", onHelpBtn, this); - childSetAction("apply", onApplyBtn, this); - childSetAction("close", onCloseBtn, this); - childSetAction("check_all", onCheckAll, this); - childSetAction("check_none", onUncheckAll, this); - childSetCommitCallback("next_owner_copy", &onCommitCopy, this); } void LLFloaterBulkPermission::doApply() @@ -113,7 +114,7 @@ void LLFloaterBulkPermission::doApply() // worked on. // NOT static, virtual! void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object, - LLInventoryObject::object_list_t* inv, + LLInventoryObject::object_list_t* inv, S32, void* q_id) { @@ -147,34 +148,31 @@ void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object, } } -void LLFloaterBulkPermission::onApplyBtn(void* user_data) +void LLFloaterBulkPermission::onApplyBtn() { - LLFloaterBulkPermission* self = static_cast(user_data); - self->doApply(); + doApply(); } -void LLFloaterBulkPermission::onHelpBtn(void* user_data) +void LLFloaterBulkPermission::onHelpBtn() { LLNotificationsUtil::add("HelpBulkPermission"); } -void LLFloaterBulkPermission::onCloseBtn(void* user_data) +void LLFloaterBulkPermission::onCloseBtn() { - LLFloaterBulkPermission* self = static_cast(user_data); - self->onClose(false); + onClose(false); } //static -void LLFloaterBulkPermission::onCommitCopy(LLUICtrl* ctrl, void* data) +void LLFloaterBulkPermission::onCommitCopy() { - LLFloaterBulkPermission* self = static_cast(data); // Implements fair use BOOL copyable = gSavedSettings.getBOOL("BulkChangeNextOwnerCopy"); if(!copyable) { gSavedSettings.setBOOL("BulkChangeNextOwnerTransfer", TRUE); } - LLCheckBoxCtrl* xfer = self->getChild("next_owner_transfer"); + LLCheckBoxCtrl* xfer = getChild("next_owner_transfer"); xfer->setEnabled(copyable); } @@ -256,7 +254,7 @@ void LLFloaterBulkPermission::doCheckUncheckAll(BOOL check) } -void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInventoryObject::object_list_t* inv) +void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInventoryObject::object_list_t* inv) { LLScrollListCtrl* list = getChild("queue output"); diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h index 1036b04a2..cd8c5760f 100644 --- a/indra/newview/llfloaterbulkpermission.h +++ b/indra/newview/llfloaterbulkpermission.h @@ -44,8 +44,6 @@ #include "llfloater.h" #include "llscrolllistctrl.h" -#include "llviewerinventory.h" - class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener, public LLFloaterSingleton { public: @@ -62,7 +60,7 @@ private: // This is the callback method for the viewer object currently // being worked on. /*virtual*/ void inventoryChanged(LLViewerObject* obj, - LLInventoryObject::object_list_t* inv, + LLInventoryObject::object_list_t* inv, S32 serial_num, void* queue); @@ -76,12 +74,12 @@ private: U8 key, bool is_new); - static void onHelpBtn(void* user_data); - static void onCloseBtn(void* user_data); - static void onApplyBtn(void* user_data); - static void onCommitCopy(LLUICtrl* ctrl, void* data); - static void onCheckAll( void* user_data) { ((LLFloaterBulkPermission*)user_data)->doCheckUncheckAll(TRUE); } - static void onUncheckAll(void* user_data) { ((LLFloaterBulkPermission*)user_data)->doCheckUncheckAll(FALSE); } + static void onHelpBtn(); + void onCloseBtn(); + void onApplyBtn(); + void onCommitCopy(); + void onCheckAll() { doCheckUncheckAll(TRUE); } + void onUncheckAll() { doCheckUncheckAll(FALSE); } // returns true if this is done BOOL isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0)); } diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp index 539a066e0..dc03d8237 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -39,7 +39,6 @@ #include "llscrolllistitem.h" #include "llpanel.h" #include "llcombobox.h" -#include "llviewertexteditor.h" const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 20; const S32 HEADER_PADDING = 38; @@ -60,7 +59,7 @@ private: }; LLNotificationChannelPanel::LLNotificationChannelPanel(const std::string& channel_name) - : LLLayoutPanel(NOTIFICATION_PANEL_HEADER_HEIGHT,true,true) +: LLLayoutPanel(NOTIFICATION_PANEL_HEADER_HEIGHT,true,true) { setName(channel_name); mChannelPtr = LLNotifications::instance().getChannel(channel_name); @@ -113,10 +112,15 @@ void LLNotificationChannelPanel::onClickNotification(void* user_data) { LLNotificationChannelPanel* self = (LLNotificationChannelPanel*)user_data; if (!self) return; - void* data = self->getChild("notifications_list")->getFirstSelected()->getUserdata(); - if (data) + LLScrollListItem* firstselected = self->getChild("notifications_list")->getFirstSelected(); + llassert(firstselected); + if (firstselected) { - gFloaterView->getParentFloater(self)->addDependentFloater(new LLFloaterNotification((LLNotification*)data), TRUE); + void* data = firstselected->getUserdata(); + if (data) + { + gFloaterView->getParentFloater(self)->addDependentFloater(new LLFloaterNotification((LLNotification*)data), TRUE); + } } } @@ -161,7 +165,9 @@ bool LLNotificationChannelPanel::update(const LLSD& payload, bool passed_filter) // LLFloaterNotificationConsole // LLFloaterNotificationConsole::LLFloaterNotificationConsole(const LLSD& key) +: LLFloater() { + mCommitCallbackRegistrar.add("ClickAdd", boost::bind(&LLFloaterNotificationConsole::onClickAdd, this)); LLUICtrlFactory::instance().buildFloater(this, "floater_notifications_console.xml"); } @@ -186,7 +192,7 @@ BOOL LLFloaterNotificationConsole::postBuild() addChannel("Notifications"); addChannel("NotificationTips"); - getChild("add_notification")->setClickedCallback(onClickAdd, this); +// getChild("add_notification")->setClickedCallback(onClickAdd, this); LLComboBox* notifications = getChild("notification_types"); LLNotificationTemplates::TemplateNames names = LLNotificationTemplates::instance().getTemplateNames(); @@ -233,21 +239,21 @@ void LLFloaterNotificationConsole::updateResizeLimits() setResizeLimits(getMinWidth(), LLFLOATER_HEADER_SIZE + HEADER_PADDING + ((NOTIFICATION_PANEL_HEADER_HEIGHT + 3) * stack.getNumPanels())); } -void LLFloaterNotificationConsole::onClickAdd(void* user_data) +void LLFloaterNotificationConsole::onClickAdd() { - LLFloaterNotificationConsole* floater = (LLFloaterNotificationConsole*)user_data; - - std::string message_name = floater->getChild("notification_types")->getValue().asString(); + std::string message_name = getChild("notification_types")->getValue().asString(); if (!message_name.empty()) { - LLNotifications::instance().add(message_name, LLSD()); + LLNotifications::instance().add(message_name, LLSD(), LLSD()); } } //=============== LLFloaterNotification ================ -LLFloaterNotification::LLFloaterNotification(LLNotification* note) : mNote(note) +LLFloaterNotification::LLFloaterNotification(LLNotification* note) +: LLFloater(), + mNote(note) { LLUICtrlFactory::instance().buildFloater(this, "floater_notification.xml"); } @@ -255,7 +261,7 @@ LLFloaterNotification::LLFloaterNotification(LLNotification* note) : mNote(note) BOOL LLFloaterNotification::postBuild() { setTitle(mNote->getName()); - getChild("payload")->setText(mNote->getMessage()); + getChild("payload")->setValue(mNote->getMessage()); LLComboBox* responses_combo = getChild("response"); LLCtrlListInterface* response_list = responses_combo->getListInterface(); diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h index c4a361538..a1baea39f 100644 --- a/indra/newview/llfloaternotificationsconsole.h +++ b/indra/newview/llfloaternotificationsconsole.h @@ -35,7 +35,9 @@ #include "llfloater.h" #include "lllayoutstack.h" -#include "llnotifications.h" +//#include "llnotificationsutil.h" + +class LLNotification; class LLFloaterNotificationConsole : public LLFloater, @@ -55,7 +57,7 @@ public: void updateResizeLimits(); private: - static void onClickAdd(void* user_data); + void onClickAdd(); }; diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index 30ec69986..35f6b9c1f 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -114,26 +114,26 @@ BOOL LLFloaterPathfindingLinksets::postBuild() { mBeaconColor = LLUI::sColorsGroup->getColor("PathfindingLinksetBeaconColor"); - mFilterByName = getChild("filter_by_name"); + mFilterByName = findChild("filter_by_name"); llassert(mFilterByName != NULL); mFilterByName->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this)); mFilterByName->setSelectAllonFocusReceived(true); mFilterByName->setCommitOnFocusLost(true); - mFilterByDescription = getChild("filter_by_description"); + mFilterByDescription = findChild("filter_by_description"); llassert(mFilterByDescription != NULL); mFilterByDescription->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this)); mFilterByDescription->setSelectAllonFocusReceived(true); mFilterByDescription->setCommitOnFocusLost(true); - mFilterByLinksetUse = getChild("filter_by_linkset_use"); + mFilterByLinksetUse = findChild("filter_by_linkset_use"); llassert(mFilterByLinksetUse != NULL); mFilterByLinksetUse->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this)); childSetAction("apply_filters", boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this)); childSetAction("clear_filters", boost::bind(&LLFloaterPathfindingLinksets::onClearFiltersClicked, this)); - mEditLinksetUse = getChild("edit_linkset_use"); + mEditLinksetUse = findChild("edit_linkset_use"); llassert(mEditLinksetUse != NULL); mEditLinksetUse->clearRows(); @@ -160,54 +160,54 @@ BOOL LLFloaterPathfindingLinksets::postBuild() mEditLinksetUse->selectFirstItem(); - mLabelWalkabilityCoefficients = getChild("walkability_coefficients_label"); + mLabelWalkabilityCoefficients = findChild("walkability_coefficients_label"); llassert(mLabelWalkabilityCoefficients != NULL); - mLabelEditA = getChild("edit_a_label"); + mLabelEditA = findChild("edit_a_label"); llassert(mLabelEditA != NULL); - mLabelSuggestedUseA = getChild("suggested_use_a_label"); + mLabelSuggestedUseA = findChild("suggested_use_a_label"); llassert(mLabelSuggestedUseA != NULL); - mEditA = getChild("edit_a_value"); + mEditA = findChild("edit_a_value"); llassert(mEditA != NULL); mEditA->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32); mEditA->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onWalkabilityCoefficientEntered, this, _1, mPreviousValueA)); - mLabelEditB = getChild("edit_b_label"); + mLabelEditB = findChild("edit_b_label"); llassert(mLabelEditB != NULL); - mLabelSuggestedUseB = getChild("suggested_use_b_label"); + mLabelSuggestedUseB = findChild("suggested_use_b_label"); llassert(mLabelSuggestedUseB != NULL); - mEditB = getChild("edit_b_value"); + mEditB = findChild("edit_b_value"); llassert(mEditB != NULL); mEditB->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32); mEditB->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onWalkabilityCoefficientEntered, this, _1, mPreviousValueB)); - mLabelEditC = getChild("edit_c_label"); + mLabelEditC = findChild("edit_c_label"); llassert(mLabelEditC != NULL); - mLabelSuggestedUseC = getChild("suggested_use_c_label"); + mLabelSuggestedUseC = findChild("suggested_use_c_label"); llassert(mLabelSuggestedUseC != NULL); - mEditC = getChild("edit_c_value"); + mEditC = findChild("edit_c_value"); llassert(mEditC != NULL); mEditC->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32); mEditC->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onWalkabilityCoefficientEntered, this, _1, mPreviousValueC)); - mLabelEditD = getChild("edit_d_label"); + mLabelEditD = findChild("edit_d_label"); llassert(mLabelEditD != NULL); - mLabelSuggestedUseD = getChild("suggested_use_d_label"); + mLabelSuggestedUseD = findChild("suggested_use_d_label"); llassert(mLabelSuggestedUseD != NULL); - mEditD = getChild("edit_d_value"); + mEditD = findChild("edit_d_value"); llassert(mEditD != NULL); mEditD->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32); mEditD->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onWalkabilityCoefficientEntered, this, _1, mPreviousValueD)); - mApplyEditsButton = getChild("apply_edit_values"); + mApplyEditsButton = findChild("apply_edit_values"); llassert(mApplyEditsButton != NULL); mApplyEditsButton->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyChangesClicked, this)); diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp index 39b7a383b..8a606a07b 100644 --- a/indra/newview/llfloaterpathfindingobjects.cpp +++ b/indra/newview/llfloaterpathfindingobjects.cpp @@ -206,46 +206,46 @@ BOOL LLFloaterPathfindingObjects::postBuild() mErrorTextColor = LLUI::sColorsGroup->getColor("PathfindingErrorColor"); mWarningTextColor = LLUI::sColorsGroup->getColor("PathfindingWarningColor"); - mObjectsScrollList = getChild("objects_scroll_list"); + mObjectsScrollList = findChild("objects_scroll_list"); llassert(mObjectsScrollList != NULL); mObjectsScrollList->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onScrollListSelectionChanged, this)); mObjectsScrollList->sortByColumnIndex(static_cast(getNameColumnIndex()), TRUE); - mMessagingStatus = getChild("messaging_status"); + mMessagingStatus = findChild("messaging_status"); llassert(mMessagingStatus != NULL); - mRefreshListButton = getChild("refresh_objects_list"); + mRefreshListButton = findChild("refresh_objects_list"); llassert(mRefreshListButton != NULL); mRefreshListButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onRefreshObjectsClicked, this)); - mSelectAllButton = getChild("select_all_objects"); + mSelectAllButton = findChild("select_all_objects"); llassert(mSelectAllButton != NULL); mSelectAllButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onSelectAllObjectsClicked, this)); - mSelectNoneButton = getChild("select_none_objects"); + mSelectNoneButton = findChild("select_none_objects"); llassert(mSelectNoneButton != NULL); mSelectNoneButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onSelectNoneObjectsClicked, this)); - mShowBeaconCheckBox = getChild("show_beacon"); + mShowBeaconCheckBox = findChild("show_beacon"); llassert(mShowBeaconCheckBox != NULL); - mTakeButton = getChild("take_objects"); + mTakeButton = findChild("take_objects"); llassert(mTakeButton != NULL); mTakeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onTakeClicked, this)); - mTakeCopyButton = getChild("take_copy_objects"); + mTakeCopyButton = findChild("take_copy_objects"); llassert(mTakeCopyButton != NULL); mTakeCopyButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onTakeCopyClicked, this)); - mReturnButton = getChild("return_objects"); + mReturnButton = findChild("return_objects"); llassert(mReturnButton != NULL); mReturnButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onReturnClicked, this)); - mDeleteButton = getChild("delete_objects"); + mDeleteButton = findChild("delete_objects"); llassert(mDeleteButton != NULL); mDeleteButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onDeleteClicked, this)); - mTeleportButton = getChild("teleport_me_to_object"); + mTeleportButton = findChild("teleport_me_to_object"); llassert(mTeleportButton != NULL); mTeleportButton->setCommitCallback(boost::bind(&LLFloaterPathfindingObjects::onTeleportClicked, this)); diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 5d6bf3a83..a382c016c 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -37,7 +37,6 @@ #include "llcolorswatch.h" //#include "llfirstuse.h" #include "llfloater.h" -#include "llfiltereditor.h" #include "llscrolllistctrl.h" #include "llscrolllistitem.h" #include "llspinctrl.h" @@ -46,7 +45,7 @@ #include "llviewercontrol.h" #include "llwindow.h" -// [RLVa:KB] +// [RLVa:KB] - Checked: 2010-03-18 (RLVa-1.2.0a) #include "rlvhandler.h" #include "rlvextensions.h" // [/RLVa:KB] @@ -57,6 +56,12 @@ LLFloaterSettingsDebug::LLFloaterSettingsDebug() , mOldControlVariable(NULL) , mOldSearchTerm(std::string("---")) { + mCommitCallbackRegistrar.add("SettingSelect", boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this)); + mCommitCallbackRegistrar.add("CommitSettings", boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); + mCommitCallbackRegistrar.add("ClickDefault", boost::bind(&LLFloaterSettingsDebug::onClickDefault, this)); + mCommitCallbackRegistrar.add("UpdateFilter", boost::bind(&LLFloaterSettingsDebug::onUpdateFilter, this, _2)); + mCommitCallbackRegistrar.add("ClickCopy", boost::bind(&LLFloaterSettingsDebug::onCopyToClipboard, this)); + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml"); } @@ -97,19 +102,9 @@ BOOL LLFloaterSettingsDebug::postBuild() } } mSettingsScrollList->sortByColumnIndex(0, true); - mSettingsScrollList->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this)); llinfos << mSettingsScrollList->getItemCount() << " total debug settings displayed." << llendl; - getChild("val_spinner_1")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("val_spinner_2")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("val_spinner_3")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("val_spinner_4")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("val_text")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("boolean_combo")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); - getChild("copy_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCopyToClipboard, this)); - getChild("default_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onClickDefault, this)); - getChild("search_settings_input")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onUpdateFilter, this, _2)); mComment = getChild("comment_text"); return TRUE; } diff --git a/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml index 9fc450145..83e2403e0 100644 --- a/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml @@ -72,10 +72,16 @@ + name="next_owner_copy" control_name="BulkChangeNextOwnerCopy" > + + + mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" > + + Selection contains no editable contents. Setting permissions on [NAME] diff --git a/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml b/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml index 7186bb41d..b35508556 100644 --- a/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml @@ -3,7 +3,9 @@ can_resize="true" enabled="true" height="500" left="176" title="Notifications Console" min_height="50" min_width="100" mouse_opaque="true" name="notifications_console" width="500"> - + diff --git a/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml b/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml index 32487a53d..59b920ecd 100644 --- a/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml @@ -2,8 +2,12 @@ - - + + + + + + False + - + + + + name="val_color_swatch" visible="false" width="37"> + + + name="val_spinner_1" visible="false" width="120"> + + + max_val="10000000" name="val_spinner_2" visible="false" width="120"> + + + max_val="10000000" name="val_spinner_3" visible="false" width="120"> + + + max_val="10000000" name="val_spinner_4" visible="false" width="120"> + +