summaryrefslogtreecommitdiff
path: root/indra/llcommon/llchat.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-09 11:07:50 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-09 11:07:50 -0500
commitb9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch)
treed843f4e78bc6874001cb81fc993cc59d0a179a83 /indra/llcommon/llchat.h
parenta59c43f1adff35107e59fdfc3016d4329324bbaf (diff)
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/llchat.h')
-rw-r--r--indra/llcommon/llchat.h3
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(),