diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llinspectobject.cpp | |
parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) |
automated merge
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
-rw-r--r-- | indra/newview/llinspectobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index a2b5ffbac4..91cbbbf430 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -480,7 +480,7 @@ void LLInspectObject::updateCreator(LLSelectNode* nodep) // Objects cannot be created by a group, so use agent URL format LLUUID creator_id = nodep->mPermissions->getCreator(); std::string creator_url = - LLSLURL("agent", creator_id, "about").getSLURLString(); + LLSLURL::buildCommand("agent", creator_id, "about"); args["[CREATOR]"] = creator_url; // created by one user but owned by another @@ -490,12 +490,12 @@ void LLInspectObject::updateCreator(LLSelectNode* nodep) if (group_owned) { owner_id = nodep->mPermissions->getGroup(); - owner_url = LLSLURL("group", owner_id, "about").getSLURLString(); + owner_url = LLSLURL::buildCommand("group", owner_id, "about"); } else { owner_id = nodep->mPermissions->getOwner(); - owner_url = LLSLURL("agent", owner_id, "about").getSLURLString(); + owner_url = LLSLURL::buildCommand("agent", owner_id, "about"); } args["[OWNER]"] = owner_url; |