diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
| commit | 7590704e0e93b48f897c47dba07916efebd95274 (patch) | |
| tree | e38f863dc5a72bc078d362a9fee214e018d0ca05 /indra/newview/lltooldraganddrop.cpp | |
| parent | 940e070326e920b6314c7153f687d9985ad763ed (diff) | |
| parent | 7efc0fbb4fd912d59a38a4d5653f1dc12c3876b1 (diff) | |
Merge with Tip
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index aa35f22930..4420b046d8 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -41,7 +41,7 @@ #include "llagentwearables.h" #include "llappearancemgr.h" #include "lldictionary.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloaterreg.h" #include "llfloatertools.h" #include "llgesturemgr.h" @@ -1199,11 +1199,11 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, locateInventory(item, cat); if(!item || !item->isComplete()) return; - if (regionp - && (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX)) - { - LLFirstUse::useSandbox(); - } + //if (regionp + // && (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX)) + //{ + // LLFirstUse::useSandbox(); + //} // check if it cannot be copied, and mark as remove if it is - // this will remove the object from inventory after rez. Only // bother with this check if we would not normally remove from |