diff options
author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/llcommon/llchat.h | |
parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) |
merge
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 63cce24005..2cc6e5c9bc 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -34,7 +34,6 @@ #ifndef LL_LLCHAT_H #define LL_LLCHAT_H -#include "llstring.h" #include "lluuid.h" #include "v3math.h" @@ -77,7 +76,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(), |