From ca51e8f33dfa0cd455438f11902fb1d839bf6206 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 27 Jul 2009 16:50:01 +0000
Subject: Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog
 layout changes. svn merge -r128075:128364
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

---
 indra/llui/lllineeditor.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/lllineeditor.cpp')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index d7c0cf4f7b..43c22cbf5d 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -115,6 +115,7 @@ LLLineEditor::Params::Params()
 	mouse_opaque = true;
 	addSynonym(select_on_focus, "select_all_on_focus_received");
 	addSynonym(border, "border");
+	addSynonym(label, "watermark_text");
 }
 
 LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
-- 
cgit v1.2.3