Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 8 insertions, 7 deletions

diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 9986e85..6e473c1 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -17,7 +17,8 @@
  * 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://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -47,8 +48,8 @@ class LLWearable
 public:
         ~LLWearable();
 
-        const LLAssetID&                getID() { return mAssetID; }
-        const LLTransactionID&          getTransactionID() { return mTransactionID; }
+        const LLAssetID&                getID() const { return mAssetID; }
+        const LLTransactionID&          getTransactionID() const { return mTransactionID; }
 
         BOOL                            isDirty();
         BOOL                            isOldVersion();
@@ -69,16 +70,16 @@ public:
         void                            setType( EWearableType type )                   { mType = type; }
 
         void                            setName( const std::string& name )                      { mName = name; }
-        const std::string&      getName()                                                               { return mName; }
+        const std::string&      getName() const                                                         { return mName; }
 
         void                            setDescription( const std::string& desc )       { mDescription = desc; }
-        const std::string&      getDescription()                                                { return mDescription; }
+        const std::string&      getDescription() const                                          { return mDescription; }
 
         void                            setPermissions( const LLPermissions& p ) { mPermissions = p; }
-        const LLPermissions& getPermissions()                                           { return mPermissions; }
+        const LLPermissions& getPermissions() const                                             { return mPermissions; }
 
         void                            setSaleInfo( const LLSaleInfo& info )   { mSaleInfo = info; }
-        const LLSaleInfo&       getSaleInfo()                                                   { return mSaleInfo; }
+        const LLSaleInfo&       getSaleInfo() const                                                     { return mSaleInfo; }
 
         const std::string&      getTypeLabel() const                                    { return LLWearable::sTypeLabel[ mType ]; }
         const std::string&      getTypeName() const                                             { return LLWearable::sTypeName[ mType ]; }