From 4c667a105132c4a3b6465ae6dfac979b51d3d285 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 9 Sep 2010 13:35:02 +0100
Subject: CID-504

Checker: UNINIT_CTOR
Function: LLWearableItemTypeNameComparator::LLWearableTypeOrder::LLWearableTypeOrder()
File: /indra/newview/llwearableitemslist.h
---
 indra/newview/llwearableitemslist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index 2b05273dc7..b060c9f076 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -361,7 +361,7 @@ private:
 		bool mSortWearableTypeByName;
 
 		LLWearableTypeOrder(ETypeListOrder order_priority, bool sort_asset_by_name, bool sort_wearable_by_name);
-		LLWearableTypeOrder(){};
+	LLWearableTypeOrder() : mOrderPriority(ORDER_RANK_UNKNOWN), mSortAssetTypeByName(false), mSortWearableTypeByName(false) {};
 	};
 
 	ETypeListOrder getTypeListOrder(LLAssetType::EType item_type) const;
-- 
cgit v1.3


From 2f7fa7ba205f6f473f816dd2e1b42d49090ddd50 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 9 Sep 2010 13:36:02 +0100
Subject: Backed out changeset 1c8d9c22bf94

---
 indra/cmake/APR.cmake              |  2 +-
 indra/cmake/Copy3rdPartyLibs.cmake |  1 +
 indra/cmake/ViewerMiscLibs.cmake   |  1 +
 indra/newview/viewer_manifest.py   |  1 +
 install.xml                        | 19 +++++++++++++++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index b6f1e06edd..180504d286 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -56,7 +56,7 @@ else (STANDALONE)
 
   if (LINUX)
     if (VIEWER)
-      list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
+      list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
     endif (VIEWER)
     list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
   endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a756770881..2dd296bf12 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -232,6 +232,7 @@ elseif(LINUX)
         libssl.so
         libstacktrace.so
         libtcmalloc.so
+        libuuid.so.1
         libssl.so.0.9.7
        )
 
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 5710360de2..32c4bc81df 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,6 +2,7 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
+  use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c447a977f0..08ba8c13b1 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -922,6 +922,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libcrypto.so.0.9.7")
             self.path("libexpat.so.1")
             self.path("libssl.so.0.9.7")
+            self.path("libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
diff --git a/install.xml b/install.xml
index 3d90c4eed2..a47a732d56 100644
--- a/install.xml
+++ b/install.xml
@@ -891,6 +891,25 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
+      <key>libuuid</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>description</key>
+        <string>Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>91b194aed4b38bc23493b198009a8c6a</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>libxml</key>
       <map>
         <key>license</key>
-- 
cgit v1.3


From 332f502ede8cc807c75eb2f6ff3c6b6aeab9e473 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 9 Sep 2010 13:56:44 +0100
Subject: CID-503

Checker: REVERSE_INULL
Function: LLOutfitsList::refreshList(const LLUUID &)
File: /indra/newview/lloutfitslist.cpp
---
 indra/newview/lloutfitslist.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 51f9a03a9c..a0ef43ea80 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -439,6 +439,7 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
 
 		static LLXMLNodePtr accordionXmlNode = getAccordionTabXMLNode();
 		LLAccordionCtrlTab* tab = LLUICtrlFactory::defaultBuilder<LLAccordionCtrlTab>(accordionXmlNode, NULL, NULL);
+		if (!tab) continue;
 
 		tab->setName(name);
 		tab->setTitle(name);
@@ -455,10 +456,7 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
 			mAccordion->removeCollapsibleCtrl(tab);
 
 			// kill removed tab
-			if (tab != NULL)
-			{
-				tab->die();
-			}
+			tab->die();
 			continue;
 		}
 
-- 
cgit v1.3