diff options
author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
commit | a4f121f065c580ac34e8caa666855c95eb29138b (patch) | |
tree | 2e9d9766c99cb7bd81aa4ad7e4af1149cfa03de6 /indra/newview/llfloaterconversationpreview.h | |
parent | 88f139594bb819bc31b438edcceaf9cd661b3f82 (diff) | |
parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
-rwxr-xr-x | indra/newview/llfloaterconversationpreview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h index f8796127ba..b0488f4ff1 100755 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -62,7 +62,7 @@ private: std::string mAccountName; std::string mCompleteName; std::string mChatHistoryFileName; - bool mChatHistoryLoaded; + bool mShowHistory; }; #endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */ |