diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
| commit | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (patch) | |
| tree | f6362bc51afe7fe463718c603ccf756a86079067 /indra/newview/llfloaterbulkpermission.cpp | |
| parent | 5870788f68c6b1fb504ae95403e7da95bc55ed4c (diff) | |
| parent | b4ca93cadce90466d41704b68933c21fe909bcb8 (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 07bd262c00..a3e8bfbf5b 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" |