6 files changed, 71 insertions, 80 deletions

diff --git a/linden/indra/lscript/lscript_alloc.h b/linden/indra/lscript/lscript_alloc.h
index 67e3dc0..4d69e8e 100644
--- a/linden/indra/lscript/lscript_alloc.h
+++ b/linden/indra/lscript/lscript_alloc.h
@@ -246,7 +246,7 @@ inline LLScriptLibData *lsa_bubble_sort(LLScriptLibData *src, S32 stride, S32 as
                 return retval;
         }
 
-        LLScriptLibData **sortarray = (LLScriptLibData **)new U32[number];
+        LLScriptLibData **sortarray = new LLScriptLibData*[number];
 
         LLScriptLibData *temp = src->mListp;
         while (temp)
@@ -290,74 +290,6 @@ inline LLScriptLibData *lsa_bubble_sort(LLScriptLibData *src, S32 stride, S32 as
 }
 
 
-inline LLScriptLibData *lsa_randomize(LLScriptLibData *src, S32 stride)
-{
-        S32 number = src->getListLength();
-
-        if (number <= 0)
-        {
-                return NULL;
-        }
-
-        if (stride <= 0)
-        {
-                stride = 1;
-        }
-
-        if (number % stride)
-        {
-                LLScriptLibData *retval = src->mListp;
-                src->mListp = NULL;
-                return retval;
-        }
-
-        LLScriptLibData **sortarray = (LLScriptLibData **)new U32[number];
-
-        LLScriptLibData *temp = src->mListp;
-        S32 i = 0;
-        while (temp)
-        {
-                sortarray[i] = temp;
-                i++;
-                temp = temp->mListp;
-        }
-
-        S32 k, j, s;
-
-        for (k = 0; k < 20; k++)
-        {
-                for (i = 0; i < number; i += stride)
-                {
-                        for (j = i; j < number; j += stride)
-                        {
-                                if (frand(1.f) > 0.5)
-                                {
-                                        for (s = 0; s < stride; s++)
-                                        {
-                                                temp = sortarray[i + s];
-                                                sortarray[i + s] = sortarray[j + s];
-                                                sortarray[j + s] = temp;
-                                        }
-                                }
-                        }
-                }
-        }
-
-        i = 1;
-        temp = sortarray[0];
-        while (i < number)
-        {
-                temp->mListp = sortarray[i++];
-                temp = temp->mListp;
-        }
-        temp->mListp = NULL;
-
-        src->mListp = NULL;
-
-        LLScriptLibData *ret_value = sortarray[0];
-        delete [] sortarray;
-
-        return ret_value;
-}
+LLScriptLibData* lsa_randomize(LLScriptLibData* src, S32 stride);
 
 #endif
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
index 581fa27..fd03fa0 100644
--- a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
@@ -19,7 +19,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
@@ -106,7 +106,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
index 1ae15ea..c61ad89 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
@@ -19,7 +19,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
@@ -106,7 +106,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
diff --git a/linden/indra/lscript/lscript_library/lscript_alloc.cpp b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
index 978d7f2..4636c0b 100644
--- a/linden/indra/lscript/lscript_library/lscript_alloc.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
@@ -1119,3 +1119,62 @@ S32 lsa_postadd_lists(U8 *buffer, S32 offset1, LLScriptLibData *data, S32 heapsi
         return lsa_heap_add_data(buffer, list1, heapsize, TRUE);
 }
 
+
+LLScriptLibData* lsa_randomize(LLScriptLibData* src, S32 stride)
+{
+        S32 number = src->getListLength();
+        if (number <= 0)
+        {
+                return NULL;
+        }
+        if (stride <= 0)
+        {
+                stride = 1;
+        }
+        if(number % stride)
+        {
+                LLScriptLibData* retval = src->mListp;
+                src->mListp = NULL;
+                return retval;
+        }
+        S32 buckets = number / stride;
+
+        // Copy everything into a special vector for sorting;
+        std::vector<LLScriptLibData*> sort_array;
+        sort_array.reserve(number);
+        LLScriptLibData* temp = src->mListp;
+        while(temp)
+        {
+                sort_array.push_back(temp);
+                temp = temp->mListp;
+        }
+
+        // We cannot simply call random_shuffle or similar algorithm since
+        // we need to obey the stride. So, we iterate over what we have
+        // and swap each with a random other segment.
+        S32 index = 0;
+        S32 ii = 0;
+        for(; ii < number; ii += stride)
+        {
+                index = ll_rand(buckets) * stride;
+                for(S32 jj = 0; jj < stride; ++jj)
+                {
+                        std::swap(sort_array[ii + jj], sort_array[index + jj]);
+                }
+        }
+
+        // copy the pointers back out
+        ii = 1;
+        temp = sort_array[0];
+        while (ii < number)
+        {
+                temp->mListp = sort_array[ii++];
+                temp = temp->mListp;
+        }
+        temp->mListp = NULL;
+
+        src->mListp = NULL;
+
+        LLScriptLibData* ret_value = sort_array[0];
+        return ret_value;
+}
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 098c836..1b92608 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -467,7 +467,7 @@ LLScriptLibraryFunction::~LLScriptLibraryFunction()
 
 void LLScriptLibrary::addFunction(LLScriptLibraryFunction *func)
 {
-        LLScriptLibraryFunction **temp = (LLScriptLibraryFunction **)new U32[mNextNumber + 1];
+        LLScriptLibraryFunction **temp = new LLScriptLibraryFunction*[mNextNumber + 1];
         if (mNextNumber)
         {
                 memcpy(temp, mFunctions, sizeof(LLScriptLibraryFunction *)*mNextNumber);
diff --git a/linden/indra/lscript/lscript_library/lscript_library.vcproj b/linden/indra/lscript/lscript_library/lscript_library.vcproj
index f4861c7..1a340da 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.vcproj
+++ b/linden/indra/lscript/lscript_library/lscript_library.vcproj
@@ -19,7 +19,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
@@ -106,7 +106,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath"
+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"