diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-01-05 14:33:58 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-01-05 14:33:58 +0200 |
commit | 5d3c4cd23bfa16aa64cb2fef6bfb1d1cda67226f (patch) | |
tree | 912add29044953cdaa4dc4e6414c516df1b4f2f1 /indra/newview/llimview.h | |
parent | 47dc1fc3437c9c266204604e85d8489b6e580584 (diff) | |
parent | b499fabab8915bd135bc2cbdc105627a458e97c8 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r-- | indra/newview/llimview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 11860d0efb..20d8e28392 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -475,6 +475,7 @@ public: protected: static std::string sPreviousSessionlName; + static LLIMModel::LLIMSession::SType sPreviousSessionType; static std::string sCurrentSessionlName; static LLIMModel::LLIMSession* sSession; static LLVoiceChannel::EState sOldState; |