Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display name change notifications that link to the user

Browse Source
This commit is contained in:
Liru Færs
2020-02-29 04:47:17 -05:00
parent c2480d7227
commit 1a61c49fc7
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llviewerdisplayname.cpp
View File

@@ -56,25 +56,22 @@ namespace LLViewerDisplayName
void doNothing() { } void doNothing() { }
} }
class LLSetDisplayNameResponder : public LLHTTPClient::ResponderIgnoreBody class LLSetDisplayNameResponder final : public LLHTTPClient::ResponderIgnoreBody
{ {
LOG_CLASS(LLSetDisplayNameResponder); LOG_CLASS(LLSetDisplayNameResponder);
private: private:
// only care about errors // only care about errors
/*virtual*/ void httpFailure() void httpFailure() override
{ {
LL_WARNS() << dumpResponse() << LL_ENDL; LLViewerDisplayName::sSetDisplayNameSignal(false, LLStringUtil::null, LLSD());
LLViewerDisplayName::sSetDisplayNameSignal(false, "", LLSD());
LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots(); LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots();
} }
/*virtual*/ char const* getName(void) const { return "LLSetDisplayNameResponder"; } char const* getName() const override { return "LLSetDisplayNameResponder"; }
}; };
void LLViewerDisplayName::set(const std::string& display_name, const set_name_slot_t& slot) void LLViewerDisplayName::set(const std::string& display_name, const set_name_slot_t& slot)
{ {
// TODO: simple validation here
LLViewerRegion* region = gAgent.getRegion(); LLViewerRegion* region = gAgent.getRegion();
llassert(region); llassert(region);
std::string cap_url = region->getCapability("SetDisplayName"); std::string cap_url = region->getCapability("SetDisplayName");
@@ -93,7 +90,7 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl
// Our display name will be in cache before the viewer's UI is available // Our display name will be in cache before the viewer's UI is available
// to request a change, so we can use direct lookup without callback. // to request a change, so we can use direct lookup without callback.
LLAvatarName av_name; LLAvatarName av_name;
if (!LLAvatarNameCache::get( gAgent.getID(), &av_name)) if (!LLAvatarNameCache::get(gAgent.getID(), &av_name))
{ {
slot(false, "name unavailable", LLSD()); slot(false, "name unavailable", LLSD());
return; return;
@@ -104,8 +101,6 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl
change_array.append(av_name.getDisplayName()); change_array.append(av_name.getDisplayName());
change_array.append(display_name); change_array.append(display_name);
LL_INFOS() << "Set name POST to " << cap_url << LL_ENDL;
// Record our caller for when the server sends back a reply // Record our caller for when the server sends back a reply
sSetDisplayNameSignal.connect(slot); sSetDisplayNameSignal.connect(slot);
@@ -117,14 +112,14 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl
LLHTTPClient::post(cap_url, body, new LLSetDisplayNameResponder, headers); LLHTTPClient::post(cap_url, body, new LLSetDisplayNameResponder, headers);
} }
class LLSetDisplayNameReply : public LLHTTPNode class LLSetDisplayNameReply final : public LLHTTPNode
{ {
LOG_CLASS(LLSetDisplayNameReply); LOG_CLASS(LLSetDisplayNameReply);
public: public:
/*virtual*/ void post( /*virtual*/ void post(
LLHTTPNode::ResponsePtr response, LLHTTPNode::ResponsePtr response,
const LLSD& context, const LLSD& context,
const LLSD& input) const const LLSD& input) const override
{ {
LLSD body = input["body"]; LLSD body = input["body"];
@@ -157,12 +152,12 @@ public:
}; };
class LLDisplayNameUpdate : public LLHTTPNode class LLDisplayNameUpdate final : public LLHTTPNode
{ {
/*virtual*/ void post( /*virtual*/ void post(
LLHTTPNode::ResponsePtr response, LLHTTPNode::ResponsePtr response,
const LLSD& context, const LLSD& context,
const LLSD& input) const const LLSD& input) const override
{ {
LLSD body = input["body"]; LLSD body = input["body"];
LLUUID agent_id = body["agent_id"]; LLUUID agent_id = body["agent_id"];
@@ -195,7 +190,7 @@ class LLDisplayNameUpdate : public LLHTTPNode
{ {
LLSD args; LLSD args;
args["OLD_NAME"] = old_display_name; args["OLD_NAME"] = old_display_name;
args["SLID"] = av_name.getUserName(); args["SLID"] = "secondlife:///app/agent/" + agent_id.asString() + "/username";
args["NEW_NAME"] = av_name.getDisplayName(); args["NEW_NAME"] = av_name.getDisplayName();
LLNotificationsUtil::add("DisplayNameUpdate", args); LLNotificationsUtil::add("DisplayNameUpdate", args);
} }