diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
| commit | 99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch) | |
| tree | 8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llchatitemscontainerctrl.h | |
| parent | 746037362ed07af0c799caf22cf9e425744359a0 (diff) | |
| parent | 7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.h')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index 4d730573d9..b28c9dbc4b 100644 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -60,6 +60,7 @@ public: static LLNearbyChatToastPanel* createInstance(); const LLUUID& getFromID() const { return mFromID;} + const std::string& getFromName() const { return mFromName; } //void addText (const std::string& message , const LLStyle::Params& input_params = LLStyle::Params()); //void setMessage (const LLChat& msg); @@ -84,9 +85,11 @@ public: virtual void draw(); + //*TODO REMOVE, why a dup of getFromID? const LLUUID& messageID() const { return mFromID;} private: LLUUID mFromID; // agent id or object id + std::string mFromName; EChatSourceType mSourceType; |