diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
| commit | dec487cd7f04f00d4aa6428d190ffbf978ea57da (patch) | |
| tree | d96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/newview/llfloaterconversationpreview.h | |
| parent | c9775dde6249582f0e8976be15e72bfebc4ac3fc (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-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_ */ |