diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
commit | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch) | |
tree | a07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/llfloateravatarpicker.cpp | |
parent | c2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff) | |
parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) |
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 9391c761b7..9f96a22f56 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -79,7 +79,6 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker(const LLSD& key) mNearMeListComplete(FALSE), mCloseOnSelect(FALSE) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml"); mCommitCallbackRegistrar.add("Refresh.FriendList", boost::bind(&LLFloaterAvatarPicker::populateFriend, this)); } |