diff options
author | davep <none@none> | 2014-08-27 13:04:32 -0500 |
---|---|---|
committer | davep <none@none> | 2014-08-27 13:04:32 -0500 |
commit | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch) | |
tree | eea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llviewerobject.cpp | |
parent | d0428575fb9c3d285dc32e61808a877cb24efa89 (diff) | |
parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) |
Automated merge with https://bitbucket.org/davep/viewer-release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rwxr-xr-x | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 7c60be7046..80592f01ce 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -100,6 +100,7 @@ #include "lltrans.h" #include "llsdutil.h" #include "llmediaentry.h" +#include "llfloaterperms.h" #include "llvocache.h" //#define DEBUG_UPDATE_TYPE @@ -2726,6 +2727,7 @@ void LLViewerObject::saveScript( * interaction with doUpdateInventory() called below. */ LL_DEBUGS() << "LLViewerObject::saveScript() " << item->getUUID() << " " << item->getAssetUUID() << LL_ENDL; + LLPointer<LLViewerInventoryItem> task_item = new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(), item->getAssetUUID(), item->getType(), |