diff options
author | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
commit | de62c3378171a69ff9a39f2f626f1b1d33d0763f (patch) | |
tree | 053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llselectmgr.cpp | |
parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 3ef810c3e9..d03a492cd1 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2435,7 +2435,7 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, std::string& name) if (identical) { - name = LLSLURL("agent", first_id, "inspect").getSLURLString(); + name = LLSLURL::buildCommand("agent", first_id, "inspect"); } else { @@ -2494,11 +2494,11 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, std::string& name) BOOL public_owner = (first_id.isNull() && !first_group_owned); if (first_group_owned) { - name = LLSLURL("group", first_id, "inspect").getSLURLString(); + name = LLSLURL::buildCommand("group", first_id, "inspect"); } else if(!public_owner) { - name = LLSLURL("agent", first_id, "inspect").getSLURLString(); + name = LLSLURL::buildCommand("agent", first_id, "inspect"); } else { @@ -2558,7 +2558,7 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, std::string& name) BOOL public_owner = (first_id.isNull()); if(!public_owner) { - name = LLSLURL("agent", first_id, "inspect").getSLURLString(); + name = LLSLURL::buildCommand("agent", first_id, "inspect"); } else { |