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

fixed EXT-2740 "There is no alert on giving/removing modify rights to 

resident"

--HG--
branch : product-engine
master
Alexei Arabadji 2009-11-27 13:34:08 +02:00
parent 00fe55c9b6
commit a04eb16976
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
indra/newview/llpanelavatar.cpp
View File

@ -50,6 +50,7 @@
#include "llweb.h"
#include "llfloaterworldmap.h"
#include "llfloaterreg.h"
#include "llnotifications.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLDropTarget
@ -199,6 +200,46 @@ void LLPanelAvatarNotes::onCommitNotes()
LLAvatarPropertiesProcessor::getInstance()-> sendNotes(getAvatarId(),notes);
}
void LLPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
const LLSD& response, S32 rights)
{
S32 option = LLNotification::getSelectedOption(notification, response);
if (option == 0)
{
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(
getAvatarId(), rights);
}
else
{
childSetValue("objects_check",
childGetValue("objects_check").asBoolean() ? FALSE : TRUE);
}
}
void LLPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights)
{
std::string first, last;
LLSD args;
if (gCacheName->getName(getAvatarId(), first, last))
{
args["FIRST_NAME"] = first;
args["LAST_NAME"] = last;
}
if (grant)
{
LLNotifications::instance().add("GrantModifyRights", args, LLSD(),
boost::bind(&LLPanelAvatarNotes::rightsConfirmationCallback, this,
_1, _2, rights));
}
else
{
LLNotifications::instance().add("RevokeModifyRights", args, LLSD(),
boost::bind(&LLPanelAvatarNotes::rightsConfirmationCallback, this,
_1, _2, rights));
}
}
void LLPanelAvatarNotes::onCommitRights()
{
S32 rights = 0;
@ -210,7 +251,14 @@ void LLPanelAvatarNotes::onCommitRights()
if(childGetValue("objects_check").asBoolean())
rights |= LLRelationship::GRANT_MODIFY_OBJECTS;
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),rights);
const LLRelationship* buddy_relationship =
LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
bool allow_modify_objects = childGetValue("objects_check").asBoolean();
if (buddy_relationship->isRightGrantedTo(
LLRelationship::GRANT_MODIFY_OBJECTS) != allow_modify_objects)
{
confirmModifyRights(allow_modify_objects, rights);
}
}
void LLPanelAvatarNotes::processProperties(void* data, EAvatarProcessorType type)

3
indra/newview/llpanelavatar.h
View File

@ -260,6 +260,9 @@ protected:
*/
void fillRightsData();
void rightsConfirmationCallback(const LLSD& notification,
const LLSD& response, S32 rights);
void confirmModifyRights(bool grant, S32 rights);
void onCommitRights();
void onCommitNotes();