summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-04-14 15:23:09 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2011-04-14 15:23:09 -0700
commit96f5a8e19cf36a59cd3b5afe413ec8e2d5fc33ce (patch)
treebf3b61dda0eca5a628dd3826e3c75e29b90ae1d3 /indra/newview/llgroupactions.cpp
parente9f6de28b2e2be98bd8bb9e62fcffafebd29a939 (diff)
add testing hook to send a group chat IM.
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r--indra/newview/llgroupactions.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 92fd84ff5b..97fa551441 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -322,10 +322,9 @@ void LLGroupActions::closeGroup(const LLUUID& group_id)
// static
-void LLGroupActions::startIM(const LLUUID& group_id)
+LLUUID LLGroupActions::startIM(const LLUUID& group_id)
{
- if (group_id.isNull())
- return;
+ if (group_id.isNull()) return LLUUID::null;
LLGroupData group_data;
if (gAgent.getGroupData(group_id, group_data))
@@ -339,12 +338,14 @@ void LLGroupActions::startIM(const LLUUID& group_id)
LLIMFloater::show(session_id);
}
make_ui_sound("UISndStartIM");
+ return session_id;
}
else
{
// this should never happen, as starting a group IM session
// relies on you belonging to the group and hence having the group data
make_ui_sound("UISndInvalidOp");
+ return LLUUID::null;
}
}