diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 10:40:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 10:40:32 -0700 |
| commit | b4a53226c8b1b4a31c0f1411b110a0a32fa3599f (patch) | |
| tree | f96c967713d9733f8bc5bae959a53ead40e393af /indra/newview/lltooldraganddrop.cpp | |
| parent | fa0c34afc6678c9ab1814c81e11c65e4bf3d1317 (diff) | |
| parent | f7f85dd0dda563a9fb49ed65b193a9ea98da9ba2 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 4f4eef0f3d..296ded6831 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2527,7 +2527,7 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( item = (LLViewerInventoryItem*)preview->getDragItem(); } } - else if(mSource == SOURCE_VIEWER) + else if(mSource == SOURCE_VIEWER || mSource == SOURCE_PEOPLE) { item = (LLViewerInventoryItem*)gToolBarView->getDragItem(); } |