diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
| commit | 41a53e864924cdb192aad9b3906006d7e8d4c91e (patch) | |
| tree | 1b3d61897aa6b5be23254f17a82dfdc55b22397b /indra/newview/llfloaterimcontainer.h | |
| parent | de9e2c38126682e5c6215151e3389380a93b8bc0 (diff) | |
| parent | fd0cae39f38673d69448e90971e2369e0b81c2fe (diff) | |
merging changes
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 85d950c58b..06af6c7b51 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -169,6 +169,7 @@ private: bool mInitialized; LLUUID mSelectedSession; + std::string mGeneralTitle; // Conversation list implementation public: |