diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-23 15:14:57 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-23 15:14:57 -0700 |
| commit | 5046e77d155bed68cbf9657616b091849c352750 (patch) | |
| tree | c53bf6276400d9bf15b697a1297e2eda3a19a3d2 /indra/newview/llconversationloglist.cpp | |
| parent | 42701ad3233bfeddf42fb1163f2b83d810b27131 (diff) | |
| parent | ff95dd4a43fd888a9b7353abcbfa701e4844a3a5 (diff) | |
merging in latest changes.
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index 0433719a89..257ec082a5 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -193,7 +193,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) break; case LLIMModel::LLIMSession::GROUP_SESSION: - LLGroupActions::startIM(selected_id); + LLGroupActions::startIM(getSelectedConversation()->getSessionID()); break; default: @@ -209,7 +209,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) break; case LLIMModel::LLIMSession::GROUP_SESSION: - LLGroupActions::startCall(selected_id); + LLGroupActions::startCall(getSelectedConversation()->getSessionID()); break; default: @@ -225,7 +225,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) break; case LLIMModel::LLIMSession::GROUP_SESSION: - LLGroupActions::show(selected_id); + LLGroupActions::show(getSelectedConversation()->getSessionID()); break; default: |