diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-06 13:01:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-06 13:01:12 -0500 |
| commit | 43eae437980226d62898c5f6fdb2a068f3b3c49b (patch) | |
| tree | 64912b2398a34b9474e481d2d26f1afb124e7351 /indra/newview/llviewerobject.cpp | |
| parent | 9185f1e25602bb9bc4c2bf7923f2743effa281fa (diff) | |
| parent | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (diff) | |
merge changes for storm-68
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 1544e66431..7de72dc2cd 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" //#define DEBUG_UPDATE_TYPE @@ -2503,6 +2504,7 @@ void LLViewerObject::saveScript( * interaction with doUpdateInventory() called below. */ lldebugs << "LLViewerObject::saveScript() " << item->getUUID() << " " << item->getAssetUUID() << llendl; + LLPointer<LLViewerInventoryItem> task_item = new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(), item->getAssetUUID(), item->getType(), |