summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-20 18:27:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-20 18:27:32 +0100
commit47699b744cf99ae9f39530dc9a08455b0d92e0f0 (patch)
tree196b43a0fd21906f217b9af865edcf3096423bd8 /indra
parent58022255b40c5242eee250d84aa5d8e101166039 (diff)
Checker: NULL_RETURNS
Function: LLViewerInventoryMoveFromWorldObserver::onAssetAdded(const LLUUID &) File: /indra/newview/llviewermessage.cpp
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c8a4b27f40..06f24d92d6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -794,7 +794,10 @@ private:
// Store selected items (without destination folder)
mSelectedItems.clear();
- mActivePanel->getRootFolder()->getSelectionList(mSelectedItems);
+ if (mActivePanel)
+ {
+ mActivePanel->getRootFolder()->getSelectionList(mSelectedItems);
+ }
mSelectedItems.erase(mMoveIntoFolderID);
}