Second Life viewer sources 1.15.1.3

1 files changed, 9 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 2fa2b51..1adb37c 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -74,8 +74,15 @@ BOOL LLFloaterNewIM::postBuild()
                 childSetAction("start_btn", &LLFloaterNewIM::onStart, this);
                 childSetAction("close_btn", &LLFloaterNewIM::onClickClose, this);
                 mSelectionList = LLViewerUICtrlFactory::getNameListByName(this, "user_list");
-                mSelectionList->setDoubleClickCallback(&LLFloaterNewIM::onStart);
-                mSelectionList->setCallbackUserData(this);
+                if (mSelectionList)
+                {
+                        mSelectionList->setDoubleClickCallback(&LLFloaterNewIM::onStart);
+                        mSelectionList->setCallbackUserData(this);
+                }
+                else
+                {
+                        llwarns << "LLViewerUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
+                }
                 sOnlineDescriptor = childGetValue("online_descriptor").asString();
                 sNameFormat = childGetValue("name_format").asString();
                 setDefaultBtn("start_btn");