Second Life viewer sources 1.18.0.6

1 files changed, 8 insertions, 4 deletions

diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 40d0c8a..be3385d 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -28,10 +28,11 @@
 #ifndef LL_LLSKIPLIST_H
 #define LL_LLSKIPLIST_H
 
-#include "llrand.h"
+#include "llerror.h"
+//#include "vmath.h"
 
 // NOTA BENE: Insert first needs to be < NOT <=
-// Binary depth must be >= 2
+
 template <class DATA_TYPE, S32 BINARY_DEPTH = 10>
 class LLSkipList
 {
@@ -143,11 +144,14 @@ private:
 // Implementation
 //
 
-
-// Binary depth must be >= 2
 template <class DATA_TYPE, S32 BINARY_DEPTH>
 inline void LLSkipList<DATA_TYPE, BINARY_DEPTH>::init()
 {
+        if (BINARY_DEPTH < 2)
+        {
+                llerrs << "Trying to create skip list with too little depth, "
+                        "must be 2 or greater" << llendl;
+        }
         S32 i;
         for (i = 0; i < BINARY_DEPTH; i++)
         {