diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
| commit | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch) | |
| tree | 2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff) | |
| parent | 1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index aa66fcf9b8..0290e7cdf0 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -63,6 +63,11 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(select_callback_t callback, // *TODO: Use a key to allow this not to be an effective singleton LLFloaterAvatarPicker* floater = LLFloaterReg::showTypedInstance<LLFloaterAvatarPicker>("avatar_picker"); + if (!floater) + { + llwarns << "Cannot instantiate avatar picker" << llendl; + return NULL; + } floater->mSelectionCallback = callback; floater->setAllowMultiple(allow_multiple); |