diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
| commit | b4ca93cadce90466d41704b68933c21fe909bcb8 (patch) | |
| tree | 34b19278571d885a42c5ae31baeb5af532e7ea39 /indra/newview/llviewerobject.cpp | |
| parent | cd382d08c84e2d984a4a20888280084daa290c3f (diff) | |
| parent | b1a7137ba6e56e1b692205f129d86acc942209e9 (diff) | |
merge up to 3.7.6-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 e62998db70..21ab1bdca5 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 @@ -2499,6 +2500,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(), |