livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Global Visibility Toggle now warns that it takes take to become effective on the server.

meow-7.2.2
Arrehn 2010-12-28 01:40:09 -05:00
parent a169b5407f
commit 2b5f241bb8
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llcallingcard.cpp
View File

@ -661,7 +661,6 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
{
msg->getUUIDFast(_PREHASH_Rights, _PREHASH_AgentRelated, agent_related, i);
msg->getS32Fast(_PREHASH_Rights,_PREHASH_RelatedRights, new_rights, i);
llinfos << "AO: New rights processed. new_ights=" << new_rights << llendl;
if(agent_id == gAgent.getID())
{
if(mBuddyInfo.find(agent_related) != mBuddyInfo.end())
@ -696,7 +695,6 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
addChangedMask(LLFriendObserver::POWERS, agent_id);
notifyObservers();
llinfos << "AO: Notifying observers.." << llendl;
notifyFriendPermissionObservers(agent_related);
}

2
indra/newview/llpanelavatar.cpp
View File

@ -206,7 +206,6 @@ void LLPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0)
{
llinfos << "AO rightsConfirmationCallback. rights= " << rights << llendl;
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(
getAvatarId(), rights);
}
@ -269,7 +268,6 @@ void LLPanelAvatarNotes::onCommitRights()
// only one checkbox can trigger commit, so store the rest of rights
else
{
llinfos << "AO: onCommitRights: New rights should be: " << rights << llendl;
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(
getAvatarId(), rights);
}

11
indra/newview/llpanelpeople.cpp
View File

@ -1123,8 +1123,7 @@ void LLPanelPeople::onAddFriendWizButtonClicked()
void LLPanelPeople::onGlobalVisToggleButtonClicked()
// Iterate through friends lists, toggling status permission on or off
{
llinfos << "TOGGLE GLOBAL FRIEND VIS" << llendl;
{
bool vis = getChild<LLUICtrl>("GlobalOnlineStatusToggle")->getValue().asBoolean();
gSavedSettings.setBOOL("GlobalOnlineStatusToggle", vis);
@ -1150,14 +1149,16 @@ void LLPanelPeople::onGlobalVisToggleButtonClicked()
else
new_rights = (cur_rights & LLRelationship::GRANT_MAP_LOCATION) + (cur_rights & LLRelationship::GRANT_MODIFY_OBJECTS);
llinfos << "TOGGLING " << buddy_id << " " << vis << llendl;
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(buddy_id,new_rights);
}
mAllFriendList->showPermissions(true);
mOnlineFriendList->showPermissions(true);
LLSD args;
args["MESSAGE"] =
llformat("Due to server load, mass toggling visibility can take a while to become effective. Please be patient." );
LLNotificationsUtil::add("GenericAlert", args);
}
void LLPanelPeople::onDeleteFriendButtonClicked()