summaryrefslogtreecommitdiff
path: root/indra/llcommon/llchat.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:35:39 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:35:39 -0400
commit068e3cc469793c75b0d54ef0864388582bb3b63c (patch)
treedbab152cf43bc84f23b2f63f9e8f8d83117e28af /indra/llcommon/llchat.h
parente748167abfabbc541c3ceb9e2d5a46fa3564f15a (diff)
parent8158c5637a9ad83a7b36b104116c37390b57c7ab (diff)
pull fix for STORM-304 / STORM-386
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(),