diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-18 13:51:24 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-18 13:51:24 -0500 |
| commit | 7f39d0472e1f0d0e929d4af6b2dadf472173f022 (patch) | |
| tree | 1dd9f6229d5fc78a011f528ec25aee33f339cb3b /indra/newview/llfloaterbulkpermission.cpp | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
| parent | 6b451ffdd6b1c75bd363864e48fbcf9b045dbd67 (diff) | |
merge changes for STORM-1831
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.cpp')
| -rwxr-xr-x | indra/newview/llfloaterbulkpermission.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index 76f62a7880..c3e9a6f5fb 100755 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -36,7 +36,7 @@ #include "llviewerobject.h" #include "llviewerobjectlist.h" #include "llviewerregion.h" -#include "lscript_rt_interface.h" +//#include "lscript_rt_interface.h" #include "llviewercontrol.h" #include "llviewerinventory.h" #include "llviewerobject.h" |