diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llfloateravatarpicker.cpp | |
parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) |
merge fixes for VWR-23296
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)); } |