10 files changed, 168 insertions, 48 deletions

diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index ae961a3..7d001ae 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -12,6 +12,8 @@ include_directories(
     )
 
 set(llcommon_SOURCE_FILES
+    imageids.cpp
+    indra_constants.cpp
     llapp.cpp
     llapr.cpp
     llassettype.cpp
diff --git a/linden/indra/llcommon/imageids.cpp b/linden/indra/llcommon/imageids.cpp
new file mode 100644
index 0000000..6b4fcd3
--- /dev/null
+++ b/linden/indra/llcommon/imageids.cpp
@@ -0,0 +1,77 @@
+/**
+ * @file imageids.cpp
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2010, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlife.com/developers/opensource/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ *
+ */
+
+#include "linden_common.h"
+
+#include "imageids.h"
+
+#include "lluuid.h"
+
+//
+// USE OF THIS FILE IS DEPRECATED
+//
+// Please use viewerart.ini and the standard
+// art import path.                                                                                                                                                     // indicates if file is only
+                                                                                                                                                // on dataserver, or also
+                                                                                                                                                        // pre-cached on viewer
+
+// Grass Images
+const LLUUID IMG_SMOKE                  ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");  // VIEWER
+
+const LLUUID IMG_DEFAULT                ("d2114404-dd59-4a4d-8e6c-49359e91bbf0");  // VIEWER
+
+const LLUUID IMG_SUN                    ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver
+const LLUUID IMG_MOON                   ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
+const LLUUID IMG_CLOUD_POOF             ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver
+const LLUUID IMG_SHOT                   ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver
+const LLUUID IMG_SPARK                  ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver
+const LLUUID IMG_FIRE                   ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
+const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
+const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
+const LLUUID IMG_INVISIBLE              ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
+
+const LLUUID IMG_EXPLOSION                              ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
+const LLUUID IMG_EXPLOSION_2                    ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
+const LLUUID IMG_EXPLOSION_3                    ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver
+const LLUUID IMG_EXPLOSION_4                    ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver
+const LLUUID IMG_SMOKE_POOF                             ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver
+
+const LLUUID IMG_BIG_EXPLOSION_1                ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver
+const LLUUID IMG_BIG_EXPLOSION_2                ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver
+
+const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER
+const LLUUID TERRAIN_DIRT_DETAIL                ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER
+const LLUUID TERRAIN_GRASS_DETAIL               ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER
+const LLUUID TERRAIN_MOUNTAIN_DETAIL    ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER
+const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
+
+const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index beba0e2..7bae496 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -33,46 +33,43 @@
 #ifndef LL_IMAGEIDS_H
 #define LL_IMAGEIDS_H
 
-#include "lluuid.h"
-
 //
 // USE OF THIS FILE IS DEPRECATED
 //
 // Please use viewerart.ini and the standard
-// art import path.                                                                                                                                                     // indicates if file is only
-                                                                                                                                                // on dataserver, or also
-                                                                                                                                                        // pre-cached on viewer
+// art import path.
+
+class LLUUID;
 
-// Grass Images
-const LLUUID IMG_SMOKE                  ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");  // VIEWER
+extern const LLUUID IMG_SMOKE;
 
-const LLUUID IMG_DEFAULT                ("d2114404-dd59-4a4d-8e6c-49359e91bbf0");  // VIEWER
+extern const LLUUID IMG_DEFAULT;
 
-const LLUUID IMG_SUN                    ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver
-const LLUUID IMG_MOON                   ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
-const LLUUID IMG_CLOUD_POOF             ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver
-const LLUUID IMG_SHOT                   ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver - legacy?
-const LLUUID IMG_SPARK                  ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver - unused
-const LLUUID IMG_FIRE                   ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver - unused
-const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
-const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
-const LLUUID IMG_INVISIBLE              ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
+extern const LLUUID IMG_SUN;
+extern const LLUUID IMG_MOON;
+extern const LLUUID IMG_CLOUD_POOF;
+extern const LLUUID IMG_SHOT;
+extern const LLUUID IMG_SPARK;
+extern const LLUUID IMG_FIRE;
+extern const LLUUID IMG_FACE_SELECT;
+extern const LLUUID IMG_DEFAULT_AVATAR;
+extern const LLUUID IMG_INVISIBLE;
 
-const LLUUID IMG_EXPLOSION                              ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver - unused
-const LLUUID IMG_EXPLOSION_2                    ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver - unused
-const LLUUID IMG_EXPLOSION_3                    ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver - unused
-const LLUUID IMG_EXPLOSION_4                    ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver - unused
-const LLUUID IMG_SMOKE_POOF                             ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver - legacy?
+extern const LLUUID IMG_EXPLOSION;
+extern const LLUUID IMG_EXPLOSION_2;
+extern const LLUUID IMG_EXPLOSION_3;
+extern const LLUUID IMG_EXPLOSION_4;
+extern const LLUUID IMG_SMOKE_POOF;
 
-const LLUUID IMG_BIG_EXPLOSION_1                ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver - unused
-const LLUUID IMG_BIG_EXPLOSION_2                ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver - unused
+extern const LLUUID IMG_BIG_EXPLOSION_1;
+extern const LLUUID IMG_BIG_EXPLOSION_2;
 
-const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER
-const LLUUID TERRAIN_DIRT_DETAIL                ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER
-const LLUUID TERRAIN_GRASS_DETAIL               ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER
-const LLUUID TERRAIN_MOUNTAIN_DETAIL    ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER
-const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
+extern const LLUUID IMG_BLOOM1;
+extern const LLUUID TERRAIN_DIRT_DETAIL;
+extern const LLUUID TERRAIN_GRASS_DETAIL;
+extern const LLUUID TERRAIN_MOUNTAIN_DETAIL;
+extern const LLUUID TERRAIN_ROCK_DETAIL;
 
-const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
+extern const LLUUID DEFAULT_WATER_NORMAL;
 
 #endif
diff --git a/linden/indra/llcommon/indra_constants.cpp b/linden/indra/llcommon/indra_constants.cpp
new file mode 100644
index 0000000..64cbb11
--- /dev/null
+++ b/linden/indra/llcommon/indra_constants.cpp
@@ -0,0 +1,47 @@
+/**
+ * @file indra_constants.cpp
+ * @brief some useful short term constants for Indra
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2010, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlife.com/developers/opensource/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "indra_constants.h"
+
+#include "lluuid.h"
+
+// "agent id" for things that should be done to ALL agents
+const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
+
+// Governor Linden's agent id.
+const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
+const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
+const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
+// Maintenance's group id.
+const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd");
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 96c0a1f..34d1538 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -34,7 +34,9 @@
 #define LL_INDRA_CONSTANTS_H
 
 #include "stdtypes.h"
-#include "lluuid.h"
+#include "llpreprocessor.h"
+
+class LLUUID;
 
 // At 45 Hz collisions seem stable and objects seem
 // to settle down at a reasonable rate.
@@ -261,14 +263,15 @@ const U8 GOD_LIKE = 1;
 const U8 GOD_NOT = 0;
 
 // "agent id" for things that should be done to ALL agents
-const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
+extern const LLUUID LL_UUID_ALL_AGENTS;
+
+// inventory library owner
+extern const LLUUID ALEXANDRIA_LINDEN_ID;
 
-// Governor Linden's agent id.
-const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
-const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
+extern const LLUUID GOVERNOR_LINDEN_ID;
+extern const LLUUID REALESTATE_LINDEN_ID;
 // Maintenance's group id.
-const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd");
+extern const LLUUID MAINTENANCE_GROUP_ID;
 
 // Flags for kick message
 const U32 KICK_FLAGS_DEFAULT    = 0x0;
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 0e56a11..aee1363 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -57,7 +57,7 @@ public:
         
         LLDynamicArray(S32 size=0) : std::vector<Type>(size) { if (size < BlockSize) std::vector<Type>::reserve(BlockSize); }
 
-        void reset() { std::vector<Type>::resize(0); }
+        void reset() { std::vector<Type>::clear(); }
 
         // ACCESSORS
         const Type& get(S32 index) const                                { return std::vector<Type>::operator[](index); }
diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp
index 41a3af3..be29448 100644
--- a/linden/indra/llcommon/lldate.cpp
+++ b/linden/indra/llcommon/lldate.cpp
@@ -113,6 +113,8 @@ void LLDate::toHTTPDateStream(std::ostream& s) const
 #else
     s.setf(ios::right);
 #endif    
+        static char const* const weekdays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
+        static char const* const months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
     std::string day = weekdays[exp_time.tm_wday];
     std::string month = months[exp_time.tm_mon];
 
diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h
index 7cc9c8a..5e1a491 100644
--- a/linden/indra/llcommon/lldate.h
+++ b/linden/indra/llcommon/lldate.h
@@ -158,9 +158,4 @@ std::ostream& operator<<(std::ostream& s, const LLDate& date);
 // Helper function to stream in a date
 std::istream& operator>>(std::istream& s, LLDate& date);
 
-
-const static std::string weekdays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
-
-const static std::string months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
 #endif // LL_LLDATE_H
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 6794be4..37e922d 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -239,7 +239,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 */
 
 #define lllog(level, broadTag, narrowTag, once) \
-        { \
+        do { \
                 static LLError::CallSite _site( \
                         level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), __FUNCTION__, broadTag, narrowTag, once);\
                 if (_site.shouldLog()) \
@@ -252,7 +252,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
                         LLError::End(); \
                         LLError::Log::flush(_out, _site); \
                 } \
-        }
+        } while(0)
 
 // DEPRECATED: Use the new macros that allow tags and *look* like macros.
 #define lldebugs        lllog(LLError::LEVEL_DEBUG, NULL, NULL, false)
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 222b85d..25a15e4 100755
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -189,9 +189,6 @@ const S32 OBJECT_OWNER = 6;
 const S32 OBJECT_GROUP = 7;
 const S32 OBJECT_CREATOR = 8;
 
-// llTextBox() magic token string - yes this is a hack.  sue me.
-const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!";
-
 // changed() event flags
 const U32       CHANGED_NONE = 0x0;
 const U32       CHANGED_INVENTORY = 0x1;