diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2011-05-03 13:43:42 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2011-05-03 13:43:42 -0400 |
commit | 88155917e6b2cec1714adc3156cb75409fdd2e38 (patch) | |
tree | 2c4534d4830bec425c101f1e6c976ccd5fc94de8 /indra/newview/llgroupactions.h | |
parent | f5355e9580a9cb0d6397ed3dbea048ba2bcbdf8e (diff) | |
parent | a13541bd0fc622f555da774bcb3daf2227868f2e (diff) |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-summary-json
Diffstat (limited to 'indra/newview/llgroupactions.h')
-rw-r--r-- | indra/newview/llgroupactions.h | 2 |
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. |