diff options
| author | James Cook <james@lindenlab.com> | 2010-03-10 15:46:45 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-10 15:46:45 -0800 |
| commit | 60799effaee5dd9696704342e9c8a35881d22583 (patch) | |
| tree | 28a10ccdc563ca4795d4018270ef36d50a6c3a1c /indra/newview/llpanelobjectinventory.cpp | |
| parent | 0ee6a6025cba2f63c5c33c20870f67afd62f6372 (diff) | |
| parent | 347585cf975afac59ec6b9960e093acd015627f5 (diff) | |
Merge
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, |