diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-21 16:00:12 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-21 16:00:12 +0300 |
| commit | 74df84be94b93f6068acd2619859a574343be41d (patch) | |
| tree | 66a1a681468c98a9341bf99228f8eeb1281bc677 /indra/newview/llviewermessage.cpp | |
| parent | 6b722079c4207eeb96aef3305ed2538933b06358 (diff) | |
| parent | 3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 960d9919ab..0d02aa56b8 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); } |