diff --git a/autobuild.xml b/autobuild.xml index b123a8e156..94cc2497b9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1927,6 +1927,7 @@ options --platform darwin + --package name @@ -2135,6 +2136,7 @@ options --platform linux32 + --package name diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 88d2c12acc..295b99089e 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -263,6 +263,19 @@ LLAvatarList::LLAvatarList(const Params& p) mLITUpdateTimer->start(); } + // AO: Because Avatarlist is shared in so many places, some without good initialization + // one-off exceptions here + if (getName() == "speakers_list") + { + mShowInfoBtn = true; + } + else + { + mShowInfoBtn = false; + } + + + LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&LLAvatarList::handleDisplayNamesOptionChanged, this)); } @@ -802,7 +815,7 @@ BOOL LLAvalineListItem::postBuild() setOnline(true); showLastInteractionTime(false); setShowProfileBtn(false); - setShowInfoBtn(false); + mAvatarIcon->setValue("Avaline_Icon"); mAvatarIcon->setToolTip(std::string("")); } diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 17f3e0f937..6eeda431fc 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -150,8 +150,6 @@ BOOL LLAvatarListItem::postBuild() mIconPermissionEditTheirs->setVisible(false); - - // radar mNearbyRange = getChild("radar_range"); mNearbyRange->setValue("N/A"); @@ -170,8 +168,8 @@ BOOL LLAvatarListItem::postBuild() mSpeakingIndicator = getChild("speaking_indicator"); mInfoBtn = getChild("info_btn"); mProfileBtn = getChild("profile_btn"); - - mInfoBtn->setVisible(true); // changed from false to have the info button always shown -WoLf + + mInfoBtn->setVisible(false); // AO: enable this by calling setShowInfoButton mInfoBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onInfoBtnClick, this)); mProfileBtn->setVisible(false); @@ -205,24 +203,8 @@ S32 LLAvatarListItem::notifyParent(const LLSD& info) void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask) { getChildView("hovered_icon")->setVisible( true); - - // AO: behave differently based on which avlist we are. Should move this into XUI or subclasses. - std::string listName = getParent()->getParent()->getName(); - if ( listName == "speakers_list" ) - { - //LLButton* b1 = getChild("info_btn"); - //b1->setVisible(TRUE); - //[RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d - mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) ); - } -// AO: We normally do not show the hover-over items because of space contraints and ease of access through better known context menu. -// mInfoBtn->setVisible(mShowInfoBtn); -// mProfileBtn->setVisible(mShowProfileBtn); -// [RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d -// mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) ); -// mProfileBtn->setVisible( (mShowProfileBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) ); -// [/RLVa:KB] + // AO, removed on-hover visibility. Don't do this. instead flip info buttons on full-time in postbuild. mHovered = true; LLPanel::onMouseEnter(x, y, mask); @@ -368,6 +350,7 @@ void LLAvatarListItem::setLastInteractionTime(U32 secs_since) void LLAvatarListItem::setShowInfoBtn(bool show) { mShowInfoBtn = show; + mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) ); } void LLAvatarListItem::setShowProfileBtn(bool show) diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 973149932a..5cf02e85d9 100755 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -1750,9 +1750,9 @@ void LLBottomTray::initResizeStateContainers() mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_SEARCH, getChild("search_btn_panel"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_WORLD_MAP, getChild("world_map_btn_panel"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MINI_MAP, getChild("mini_map_btn_panel"))); -// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild("bottom_sbhome"))); -// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild("bottom_sbme"))); -// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild("bottom_sbplaces"))); + mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild("bottom_sbhome"))); + mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild("bottom_sbme"))); + mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild("bottom_sbplaces"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_APPEARANCE, getChild("bottom_sbappearance"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_INVENTORY, getChild("bottom_sbinv"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_AO, getChild("ao_btn_panel"))); // ## Zi: Animation Overrider @@ -1769,16 +1769,16 @@ void LLBottomTray::initResizeStateContainers() mButtonsProcessOrder.push_back(RS_BUTTON_GESTURES); mButtonsProcessOrder.push_back(RS_BUTTON_MOVEMENT); mButtonsProcessOrder.push_back(RS_BUTTON_CAMERA); -// mButtonsProcessOrder.push_back(RS_BUTTON_AVATARS); + mButtonsProcessOrder.push_back(RS_BUTTON_AVATARS); mButtonsProcessOrder.push_back(RS_BUTTON_SNAPSHOT); mButtonsProcessOrder.push_back(RS_BUTTON_PEOPLE); mButtonsProcessOrder.push_back(RS_BUTTON_BUILD); mButtonsProcessOrder.push_back(RS_BUTTON_SEARCH); mButtonsProcessOrder.push_back(RS_BUTTON_WORLD_MAP); mButtonsProcessOrder.push_back(RS_BUTTON_MINI_MAP); -//AO mButtonsProcessOrder.push_back(RS_BUTTON_HOME); -//AO mButtonsProcessOrder.push_back(RS_BUTTON_ME); -//AO mButtonsProcessOrder.push_back(RS_BUTTON_PLACES); + mButtonsProcessOrder.push_back(RS_BUTTON_HOME); + mButtonsProcessOrder.push_back(RS_BUTTON_ME); + mButtonsProcessOrder.push_back(RS_BUTTON_PLACES); mButtonsProcessOrder.push_back(RS_BUTTON_APPEARANCE); mButtonsProcessOrder.push_back(RS_BUTTON_INVENTORY); mButtonsProcessOrder.push_back(RS_BUTTON_AO); // ## Zi: Animation Overrider @@ -1834,9 +1834,9 @@ void LLBottomTray::initButtonsVisibility() setVisibleAndFitWidths(RS_BUTTON_WORLD_MAP, gSavedSettings.getBOOL("ShowWorldMapButton")); setVisibleAndFitWidths(RS_BUTTON_MINI_MAP, gSavedSettings.getBOOL("ShowMiniMapButton")); -//AO setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton")); -//AO setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton")); -//AO setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton")); + setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton")); + setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton")); + setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton")); setVisibleAndFitWidths(RS_BUTTON_AO, gSavedSettings.getBOOL("ShowAOButton")); // ## Zi: Animation Overrider setVisibleAndFitWidths(RS_BUTTON_QUICKPREFS, gSavedSettings.getBOOL("ShowQuickPrefsButton")); // Quick Preferences panel -WoLf // take care of additional sidebar button visibility -Zi @@ -1865,9 +1865,9 @@ void LLBottomTray::setButtonsControlsAndListeners() gSavedSettings.getControl("ShowSearchButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_SEARCH, _2)); gSavedSettings.getControl("ShowWorldMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_WORLD_MAP, _2)); gSavedSettings.getControl("ShowMiniMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MINI_MAP, _2)); -// gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2)); -// gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2)); -// gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2)); + gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2)); + gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2)); + gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2)); gSavedSettings.getControl("ShowAOButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_AO, _2)); // ## Zi: Animation Overrider gSavedSettings.getControl("ShowQuickPrefsButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_QUICKPREFS, _2)); // Quick Preferences panel -WoLf // take care of additional sidebar button visibility -Zi @@ -2205,9 +2205,13 @@ std::string LLBottomTray::resizeStateToString(EResizeState state) case RS_BUTTON_HOWTO: rs_string = "RS_BUTTON_HOWTO"; break; case RS_BUTTON_SPLITTER_1: rs_string = "RS_BUTTON_SPLITTER_1"; break; // - case RS_BUTTON_APPEARANCE: rs_string = "RS_BUTTON_APPEARANCE"; break; - case RS_BUTTON_INVENTORY: rs_string = "RS_BUTTON_INVENTORY"; break; - case RS_BUTTON_QUICKPREFS: rs_string = "RS_BUTTON_QUICKPREFS"; break; + case RS_BUTTON_APPEARANCE: rs_string = "RS_BUTTON_APPEARANCE"; break; + case RS_BUTTON_INVENTORY: rs_string = "RS_BUTTON_INVENTORY"; break; + case RS_BUTTON_PLACES: rs_string = "RS_BUTTON_PLACES"; break; + case RS_BUTTON_AO: rs_string = "RS_BUTTON_AO"; break; + case RS_BUTTON_QUICKPREFS: rs_string = "RS_BUTTON_QUICKPREFS"; break; + case RS_BUTTON_HOME: rs_string = "RS_BUTTON_HOME"; break; + case RS_BUTTON_ME: rs_string = "RS_BUTTON_ME"; break; // case RS_BUTTON_SPLITTER_2: rs_string = "RS_BUTTON_SPLITTER_2"; break; case RS_BUTTONS_CAN_BE_HIDDEN: rs_string = "RS_BUTTONS_CAN_BE_HIDDEN"; break; diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index b2bcfab16b..6a9575262b 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -152,6 +152,7 @@ public: private: typedef enum e_resize_state { + // LL Stock buttons RS_NORESIZE = 0x0000, RS_CHICLET_PANEL = 0x0001, RS_CHATBAR_INPUT = 0x0002, @@ -173,12 +174,15 @@ private: RS_BUTTON_HOWTO = 0x20000, RS_BUTTON_SPLITTER_1 = 0x40000, RS_BUTTON_SPLITTER_2 = 0x80000, - //-TT 2.6.9 - changed values to let the defaults be same as LL - RS_BUTTON_AO = 0x10000, // ## Zi: Animation Overrider - // sidebar buttons -Zi + + // FS Buttons + RS_BUTTON_AO = 0x100000, // ## Zi: Animation Overrider RS_BUTTON_APPEARANCE = 0x200000, RS_BUTTON_INVENTORY = 0x400000, RS_BUTTON_QUICKPREFS = 0x800000, // Quick Preferences panel -WoLf + RS_BUTTON_PLACES = 0x1000000, + RS_BUTTON_HOME = 0x2000000, + RS_BUTTON_ME = 0x4000000, /* Once new button that can be hidden on resize is added don't forget to update related places: @@ -193,9 +197,10 @@ private: */ RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES | RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP - | RS_BUTTON_AO // ## Zi: Animation Overrider - | RS_BUTTON_PEOPLE | RS_BUTTON_APPEARANCE | RS_BUTTON_INVENTORY // more sidebar buttons -Zi - | RS_BUTTON_QUICKPREFS // Quick Preferences panel -WoLf + | RS_BUTTON_DESTINATIONS | RS_BUTTON_AVATARS + | RS_BUTTON_PROFILE | RS_BUTTON_HOWTO | RS_BUTTON_PEOPLE | RS_BUTTON_APPEARANCE + | RS_BUTTON_INVENTORY | RS_BUTTON_PLACES | RS_BUTTON_HOME | RS_BUTTON_ME + // AO: Removed AO and QUickprefs from the "can be hidden" list, due to the strong number of use cases for these, even in very small screens }EResizeState; diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 71df8e4b3c..9754d7eadd 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -269,7 +269,6 @@ - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - -