diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
| commit | d0d1534e34a544a2a2acc9993421f587bb4f6ede (patch) | |
| tree | 99eb3d9b83bcbcaaedf3413aa2eecbf3cf329fbe /indra/newview/llpanelobjectinventory.cpp | |
| parent | df50590145a835531a9539a96e8349f910161f53 (diff) | |
| parent | 7b029036339ae1770307ff33ccd5d540e2618748 (diff) | |
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 5ddbdf7f01..6fcba80845 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -770,8 +770,8 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); if(object) { - LLInventoryItem* inv = NULL; - if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID))) + const LLInventoryItem *inv = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); + if (inv) { const LLPermissions& perm = inv->getPermissions(); bool can_copy = gAgent.allowOperation(PERM_COPY, perm, |