Second Life viewer sources 1.13.2.15

1 files changed, 2 insertions, 70 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