diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-07 17:09:46 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-07 17:09:46 -0700 |
| commit | 89fad5ded4b5e78bf83f5c9817cb5220703883bc (patch) | |
| tree | 3575e72890c82cf28ddcfbe18ca778f9dfef8fc6 /indra/newview/llpreviewscript.cpp | |
| parent | 6900278d7f787f8a3fe5d06e2eceb91c9dd9d5bd (diff) | |
| parent | 2288edf80ff87ca55b49b22b0f794083f78f86d9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 4167408fc3..6b0e524f8c 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -41,6 +41,7 @@ #include "llcombobox.h" #include "lldir.h" #include "llfloaterreg.h" +#include "llinventorydefines.h" #include "llinventorymodel.h" #include "llkeyboard.h" #include "lllineeditor.h" @@ -1578,7 +1579,7 @@ void LLLiveLSLEditor::loadAsset() DEFAULT_SCRIPT_NAME, DEFAULT_SCRIPT_DESC, LLSaleInfo::DEFAULT, - LLInventoryItem::II_FLAGS_NONE, + LLInventoryItemFlags::II_FLAGS_NONE, time_corrected()); mAssetStatus = PREVIEW_ASSET_LOADED; } |