summaryrefslogtreecommitdiff
path: root/indra/newview/llgrouplist.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-10-11 10:40:05 -0700
committerAndrew Meadows <andrew@lindenlab.com>2010-10-11 10:40:05 -0700
commit92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch)
treea07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/llgrouplist.cpp
parentc2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff)
parent48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff)
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r--indra/newview/llgrouplist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index 4f9d51ce58..c3e6e1c2dc 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -283,7 +283,7 @@ mGroupNameBox(NULL),
mInfoBtn(NULL),
mGroupID(LLUUID::null)
{
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group_list_item.xml");
+ buildFromFile( "panel_group_list_item.xml");
// Remember group icon width including its padding from the name text box,
// so that we can hide and show the icon again later.