summaryrefslogtreecommitdiff
path: root/indra/newview/llcolorswatch.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
committerLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
commit5b7b3cbbbbec439880a33af8944d10c7bb527c3a (patch)
tree3e37afeba3e2bb67f53327719de72b4506d2605e /indra/newview/llcolorswatch.cpp
parentc7dd3aac83eb9bde5fe0febaebcd998847bf1889 (diff)
parent2fba01d160716b886a7dfc0c86abda767a25d23f (diff)
Merge
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
-rw-r--r--indra/newview/llcolorswatch.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index d77ebc5367..5b942f283a 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -57,7 +57,6 @@ LLColorSwatchCtrl::Params::Params()
caption_text("caption_text"),
border("border")
{
- name = "colorswatch";
}
LLColorSwatchCtrl::LLColorSwatchCtrl(const Params& p)