summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-05-02 21:02:53 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-05-02 21:02:53 -0400
commita13541bd0fc622f555da774bcb3daf2227868f2e (patch)
tree40442503a805ef75c010f47e92cf823a6c19a8ba /indra/newview/llgroupactions.h
parent8f720b59d35d172b0a34ff73c7724d9bae258aa2 (diff)
parent6a5de7a829ca4fb2af37ff24098acf582ee93e9e (diff)
Automated merge with file:///Users/nat/linden/viewer-summary-json
Diffstat (limited to 'indra/newview/llgroupactions.h')
-rw-r--r--indra/newview/llgroupactions.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index c52a25818b..3f9852f194 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -87,7 +87,7 @@ public:
/**
* Start group instant messaging session.
*/
- static void startIM(const LLUUID& group_id);
+ static LLUUID startIM(const LLUUID& group_id);
/**
* End group instant messaging session.