diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/llimpanel.h | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llimpanel.h')
| -rw-r--r-- | indra/newview/llimpanel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 5348308a83..28ea002583 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -78,7 +78,7 @@ public: const LLUUID& getSessionID() const { return mSessionUUID; } const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; } - const EInstantMessage getDialogType() const { return mDialog; } + EInstantMessage getDialogType() const { return mDialog; } void sessionInitReplyReceived(const LLUUID& im_session_id); |