diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index efa54269ee9314c701a6cd43f5c45e1ac56b6eb2..e648cbde69afab1c9fc5ecb2a9ce621f2802879a 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -45,7 +45,7 @@ #include "lluuid.h" #include "llvoiceclient.h" #include "llviewercontrol.h" // for gSavedSettings -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) #include "rlvhandler.h" // [/RLVa:KB] @@ -397,7 +397,7 @@ BOOL LLAvatarList::handleRightMouseDown(S32 x, S32 y, MASK mask) { BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); // if ( mContextMenu ) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d if ( (mContextMenu) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) ) // [/RLVa:KB] { @@ -456,13 +456,13 @@ void LLAvatarList::updateLastInteractionTimes() void LLAvatarList::onItemDoucleClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask) { // mItemDoubleClickSignal(ctrl, x, y, mask); -// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0d) | Added: RLVa-1.2.0d if ( (!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) mItemDoubleClickSignal(ctrl, x, y, mask); // [/RLVa:KB] } -// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0d) | Added: RLVa-1.2.0d void LLAvatarList::refreshNames() { std::vector<LLPanel*> items; diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index c8bb443b01d647120653ec13c62be0ddd23ba979..692df2f94755ffe5da25a65e212f0646506465aa 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -308,7 +308,7 @@ void LLCallFloater::updateSession() } } -// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0d) | Added: RLVa-1.2.0d mAvatarList->setRlvCheckShowNames(is_local_chat); // [/RLVa:KB] } diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 874323d7674eb0bb5ae835fc1a23f4b2a848d1ec..f2451d5c440b15f3602648563cbce97f99fd56aa 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -195,7 +195,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification) style_params_name.font.size(font_style_size); // style_params_name.link_href = LLSLURL("agent",mFromID,"about").getSLURLString(); -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Added: RLVa-1.2.0d if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) style_params_name.link_href = LLSLURL("agent",mFromID,"about").getSLURLString(); // [/RLVa:KB] diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 23e9d950d13a2940caa75fa6465c8b2485e3299f..4383e4c9adca842c2622a696f8df28dd8f6b3614 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -36,7 +36,7 @@ #include "lltooldraganddrop.h" // for LLToolDragAndDrop #include "llviewercontrol.h" #include "llworld.h" -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) #include "rlvhandler.h" // [/RLVa:KB] @@ -238,7 +238,7 @@ void LLFloaterAvatarPicker::onList() { childSetEnabled("ok_btn", isSelectBtnEnabled()); -// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-05 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d if (rlv_handler_t::isEnabled()) { LLTabContainer* pTabs = getChild<LLTabContainer>("ResidentChooserTabs"); diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 60c26e3fd34b15f1b197745271b5c8c740df2294..eba7800170fa3e6571c55b7e04cef505b83334c4 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -60,7 +60,7 @@ #include "llvoiceclient.h" #include "llworld.h" #include "llspeakers.h" -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) #include "rlvhandler.h" // [/RLVa:KB] @@ -831,7 +831,7 @@ void LLPanelPeople::updateButtons() bool enable_calls = LLVoiceClient::getInstance()->isVoiceWorking() && LLVoiceClient::getInstance()->voiceEnabled(); -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d if ( (nearby_tab_active) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) { item_selected = multiple_selected = false; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index d1b0686cfed9ecc55438c60fb7e8c00b6323839d..56a6ac53b64808bd7f1fec290171c15a76988ae4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3192,7 +3192,7 @@ class LLAvatarGiveCard : public view_listener_t llinfos << "handle_give_card()" << llendl; LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); // if(dest && dest->isAvatar()) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d if ( (dest && dest->isAvatar()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) // [/RLVa:KB] { @@ -3643,7 +3643,7 @@ class LLAvatarEnableAddFriend : public view_listener_t { LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()); // bool new_value = avatar && !LLAvatarActions::isFriend(avatar->getID()); -// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0f) | +// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f bool new_value = avatar && !LLAvatarActions::isFriend(avatar->getID()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)); // [/RLVa:KB] return new_value; @@ -5562,7 +5562,7 @@ class LLAvatarInviteToGroup : public view_listener_t { LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() ); // if(avatar) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Added: RLVa-1.2.0d if ( (avatar) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) // [/RLVa:KB] { @@ -5934,7 +5934,7 @@ class LLShowAgentProfile : public view_listener_t LLVOAvatar* avatar = find_avatar_from_object(agent_id); // if (avatar) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d if ( (avatar) && ((!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) || (gAgent.getID() == agent_id)) ) // [/RLVa:KB] { @@ -6576,7 +6576,7 @@ class LLAvatarSendIM : public view_listener_t { LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() ); // if(avatar) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Added: RLVa-1.2.0d if ( (avatar) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) // [/RLVa:KB] { @@ -6592,7 +6592,7 @@ class LLAvatarCall : public view_listener_t { LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() ); // if(avatar) -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0X) | Added: RLVa-1.2.0X +// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.0d) | Added: RLVa-1.2.0d if ( (avatar) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) // [/RLVa:KB] { diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp index 3fc008ffa59e06b3598f629d51ccb7ce3517aaa2..46553b0713c9a8de2663e382f52fd7933c410326 100644 --- a/indra/newview/rlvui.cpp +++ b/indra/newview/rlvui.cpp @@ -286,7 +286,7 @@ void RlvUIEnabler::onToggleShowMinimap() removeGenericFloaterFilter("mini_map"); } -// Checked: 2010-06-05 (RLVa-1.2.0X) | Modified: RLVa-1.2.0X +// Checked: 2010-06-05 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d void RlvUIEnabler::onToggleShowNames() { // Refresh the nearby people list