summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexteditor.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
committerJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
commitaeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch)
tree5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llviewertexteditor.cpp
parentdbf45ad4294a59c050982b5a417fe86272026454 (diff)
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
-rw-r--r--indra/newview/llviewertexteditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 16ba5d29ea..7d04f04528 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -386,7 +386,7 @@ void LLEmbeddedItems::markSaved()
class LLTextCmdInsertEmbeddedItem : public LLTextCmd
{
public:
- LLTextCmdInsertEmbeddedItem::LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item )
+ LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item )
: LLTextCmd(pos, FALSE),
mExtCharValue(0)
{