diff options
author | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
commit | cbbf1504f015f42e3426a92129824e05021e1fe3 (patch) | |
tree | 4922b33e421f7c1184330f62793f6f9519e149de /indra/newview/llfloaterconversationpreview.h | |
parent | 6194302a849431e84c046325d3cd19e92f62aa6f (diff) | |
parent | 4b6e1c26f05d89aa130a899803553940069457c0 (diff) |
merging
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
-rw-r--r-- | indra/newview/llfloaterconversationpreview.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h index 0341e5d2a0..b17ae84b63 100644 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -29,6 +29,9 @@ #include "llchathistory.h" #include "llfloater.h" +extern const std::string LL_FCP_COMPLETE_NAME; //"complete_name" +extern const std::string LL_FCP_ACCOUNT_NAME; //"user_name" + class LLSpinCtrl; class LLFloaterConversationPreview : public LLFloater @@ -54,6 +57,8 @@ private: int mPageSize; std::list<LLSD> mMessages; + std::string mAccountName; + std::string mCompleteName; }; #endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */ |