diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
| commit | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch) | |
| tree | 39a949e1570c3524c8560522b693328fc7d9afbf /indra/llcommon/llchat.h | |
| parent | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff) | |
| parent | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff) | |
merge up to viewer-development
Diffstat (limited to 'indra/llcommon/llchat.h')
| -rw-r--r-- | indra/llcommon/llchat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index 52b85c7bba..87c2d6775b 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -28,7 +28,6 @@ #ifndef LL_LLCHAT_H #define LL_LLCHAT_H -#include "llstring.h" #include "lluuid.h" #include "v3math.h" @@ -71,7 +70,7 @@ typedef enum e_chat_style class LLChat { public: - LLChat(const std::string& text = LLStringUtil::null) + LLChat(const std::string& text = std::string()) : mText(text), mFromName(), mFromID(), |