diff options
| author | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
| commit | 461550a8ff492dadd026d68949ef732d447bf592 (patch) | |
| tree | d03f59b0f663218b681abf124af9eef0dd44b8f6 /indra/newview/llfloaterconversationpreview.h | |
| parent | 1aadf94fe44036d6012eb7d4f8a0b9288a719f37 (diff) | |
| parent | c2bb1a189c5f4c2367ee38e03371b28948e3ea81 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
| -rw-r--r-- | 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 5105ef3702..2246a44761 100644 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -39,7 +39,7 @@ public: virtual BOOL postBuild(); virtual void draw(); - virtual void onOpen(const LLSD& session_id); + virtual void onOpen(const LLSD& key); private: void onMoreHistoryBtnClick(); |