diff options
author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
---|---|---|
committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/llfloateravatarpicker.cpp | |
parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) |
pull and merge from viewer-development
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); |