diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
commit | bb2a0adecaee2f7464caff602473d75c6b65bcaa (patch) | |
tree | 6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/newview/llselectmgr.cpp | |
parent | 7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff) | |
parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) |
Merge from default branch
--HG--
branch : product-engine
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 { |