summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-21 17:11:31 -0700
committerJames Cook <james@lindenlab.com>2010-05-21 17:11:31 -0700
commitd674d11f895b8f3d578cded931cdc1c430379c95 (patch)
tree91ed1a14337d6abf26291de16aa9d28304a33beb /indra/newview/llavataractions.cpp
parent8992232e64155588c64b4ab29bad6766bc6c7ff6 (diff)
Rename LLAvatarName::getNameAndSLID() to getCompleteName()
Discussed with Leyla/Richard
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r--indra/newview/llavataractions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 708ef1895e..1d1a127dae 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -190,7 +190,7 @@ void LLAvatarActions::offerTeleport(const uuid_vec_t& ids)
static void on_avatar_name_cache_start_im(const LLUUID& agent_id,
const LLAvatarName& av_name)
{
- std::string name = av_name.getNameAndSLID();
+ std::string name = av_name.getCompleteName();
LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id);
if (session_id != LLUUID::null)
{
@@ -225,7 +225,7 @@ void LLAvatarActions::endIM(const LLUUID& id)
static void on_avatar_name_cache_start_call(const LLUUID& agent_id,
const LLAvatarName& av_name)
{
- std::string name = av_name.getNameAndSLID();
+ std::string name = av_name.getCompleteName();
LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, true);
if (session_id != LLUUID::null)
{