diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
| commit | 60f602d5e12a50623b51b13e097992f79006823f (patch) | |
| tree | 386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 29da931051202a10ea71db56e47acecae1603a5d (diff) | |
| parent | ccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff) | |
Pull from VirLinden/drano
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); |