25 files changed, 210 insertions, 58 deletions

diff --git a/linden/indra/llinventory/llcategory.cpp b/linden/indra/llinventory/llcategory.cpp
index 93f86f9..2341999 100644
--- a/linden/indra/llinventory/llcategory.cpp
+++ b/linden/indra/llinventory/llcategory.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llcategory.cpp
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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"
diff --git a/linden/indra/llinventory/llcategory.h b/linden/indra/llinventory/llcategory.h
index ed28a7f..c7c4067 100644
--- a/linden/indra/llinventory/llcategory.h
+++ b/linden/indra/llinventory/llcategory.h
@@ -2,6 +2,8 @@
  * @file llcategory.h
  * @brief LLCategory class header file.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #ifndef LL_LLCATEGORY_H
diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp
index e3e909b..24e9bf1 100644
--- a/linden/indra/llinventory/lleconomy.cpp
+++ b/linden/indra/llinventory/lleconomy.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file lleconomy.cpp
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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"
diff --git a/linden/indra/llinventory/lleconomy.h b/linden/indra/llinventory/lleconomy.h
index acda67e..d1e1adc 100644
--- a/linden/indra/llinventory/lleconomy.h
+++ b/linden/indra/llinventory/lleconomy.h
@@ -1,6 +1,8 @@
 /** 
  * @file lleconomy.h
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #ifndef LL_LLECONOMY_H
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 3800de2..4d411e6 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -2,6 +2,8 @@
  * @file llinventory.cpp
  * @brief Implementation of the inventory system.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,12 +26,11 @@
  * 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 <time.h>
-
 #include "llinventory.h"
 
 #include "lldbstrings.h"
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index b24fe79..065c82d 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -2,6 +2,8 @@
  * @file llinventory.h
  * @brief LLInventoryItem and LLInventoryCategory class declaration.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #ifndef LL_LLINVENTORY_H
diff --git a/linden/indra/llinventory/llinventorytype.cpp b/linden/indra/llinventory/llinventorytype.cpp
index 96dfb5e..ac16cea 100644
--- a/linden/indra/llinventory/llinventorytype.cpp
+++ b/linden/indra/llinventory/llinventorytype.cpp
@@ -2,6 +2,8 @@
  * @file llinventorytype.cpp
  * @brief Inventory item type, more specific than an asset type.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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"
diff --git a/linden/indra/llinventory/llinventorytype.h b/linden/indra/llinventory/llinventorytype.h
index 7d34c87..dcc2502 100644
--- a/linden/indra/llinventory/llinventorytype.h
+++ b/linden/indra/llinventory/llinventorytype.h
@@ -2,6 +2,8 @@
  * @file llinventorytype.h
  * @brief Inventory item type, more specific than an asset type.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #ifndef LLINVENTORYTYPE_H
diff --git a/linden/indra/llinventory/lllandmark.cpp b/linden/indra/llinventory/lllandmark.cpp
index ae7a991..cac41c3 100644
--- a/linden/indra/llinventory/lllandmark.cpp
+++ b/linden/indra/llinventory/lllandmark.cpp
@@ -2,6 +2,8 @@
  * @file lllandmark.cpp
  * @brief Landmark asset class
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,15 +26,13 @@
  * 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 "lllandmark.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <stdio.h>      // for sscanf() on linux
 
 #include "message.h"
 #include "llregionhandle.h"
diff --git a/linden/indra/llinventory/lllandmark.h b/linden/indra/llinventory/lllandmark.h
index 69c377a..fbcd950 100644
--- a/linden/indra/llinventory/lllandmark.h
+++ b/linden/indra/llinventory/lllandmark.h
@@ -2,6 +2,8 @@
  * @file lllandmark.h
  * @brief Landmark asset class
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 86eb5b2..733a567 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -2,6 +2,8 @@
  * @file llnotecard.cpp
  * @brief LLNotecard class definition
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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"
diff --git a/linden/indra/llinventory/llnotecard.h b/linden/indra/llinventory/llnotecard.h
index 3d89c7a..369bf78 100644
--- a/linden/indra/llinventory/llnotecard.h
+++ b/linden/indra/llinventory/llnotecard.h
@@ -2,6 +2,8 @@
  * @file llnotecard.h
  * @brief LLNotecard class declaration
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #ifndef LL_NOTECARD_H
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 5902acd..3a67385 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -2,6 +2,8 @@
  * @file llparcel.cpp
  * @brief A land parcel.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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"
@@ -256,42 +259,25 @@ void LLParcel::overrideParcelFlags(U32 flags)
         mParcelFlags = flags;
 }
 
-void set_std_string(const char* src, std::string& dest)
-{
-        if(src)
-        {
-                dest.assign(src);
-        }
-        else
-        {
-#if (LL_LINUX && __GNUC__ < 3)
-                dest.assign(std::string(""));
-#else
-                dest.clear();
-#endif
-        }
-}
-
-void LLParcel::setName(const char* name)
+void LLParcel::setName(const LLString& name)
 {
         // The escaping here must match the escaping in the database
         // abstraction layer.
-        set_std_string(name, mName);
+        mName = name;
         LLStringFn::replace_nonprintable(mName, LL_UNKNOWN_CHAR);
 }
 
-void LLParcel::setDesc(const char* desc)
+void LLParcel::setDesc(const LLString& desc)
 {
         // The escaping here must match the escaping in the database
         // abstraction layer.
-        set_std_string(desc, mDesc);
+        mDesc = desc;
         mDesc = rawstr_to_utf8(mDesc);
 }
 
-void LLParcel::setMusicURL(const char* url)
+void LLParcel::setMusicURL(const LLString& url)
 {
-        set_std_string(url, mMusicURL);
-
+        mMusicURL = url;
         // The escaping here must match the escaping in the database
         // abstraction layer.
         // This should really filter the url in some way. Other than
@@ -299,10 +285,9 @@ void LLParcel::setMusicURL(const char* url)
         LLStringFn::replace_nonprintable(mMusicURL, LL_UNKNOWN_CHAR);
 }
 
-void LLParcel::setMediaURL(const char* url)
+void LLParcel::setMediaURL(const LLString& url)
 {
-        set_std_string(url, mMediaURL);
-
+        mMediaURL = url;
         // The escaping here must match the escaping in the database
         // abstraction layer if it's ever added.
         // This should really filter the url in some way. Other than
@@ -568,19 +553,19 @@ BOOL LLParcel::importStream(std::istream& input_stream)
                 }
                 else if ("name" == keyword)
                 {
-                        setName( value.c_str() );
+                        setName( value );
                 }
                 else if ("desc" == keyword)
                 {
-                        setDesc( value.c_str() );
+                        setDesc( value );
                 }
                 else if ("music_url" == keyword)
                 {
-                        setMusicURL( value.c_str() );
+                        setMusicURL( value );
                 }
                 else if ("media_url" == keyword)
                 {
-                        setMediaURL( value.c_str() );
+                        setMediaURL( value );
                 }
                 else if ("media_id" == keyword)
                 {
@@ -1835,3 +1820,4 @@ LLParcel::ECategory category_ui_string_to_category(const char* s)
         return LLParcel::C_ANY;
 }
 
+
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 66af8ad..9c63008 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -1,6 +1,8 @@
 /** 
  * @file llparcel.h
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,15 +25,12 @@
  * 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$
  */
 
 #ifndef LL_LLPARCEL_H
 #define LL_LLPARCEL_H
 
-#include <time.h>
-#include <iostream>
-
-#include "lldarray.h"
 #include "lluuid.h"
 #include "llparcelflags.h"
 #include "llpermissions.h"
@@ -204,10 +203,10 @@ public:
 
         // MANIPULATORS
         void generateNewID() { mID.generate(); }
-        void setName(const char* name);
-        void setDesc(const char* desc);
-        void setMusicURL(const char* url);
-        void setMediaURL(const char* url);
+        void setName(const LLString& name);
+        void setDesc(const LLString& desc);
+        void setMusicURL(const LLString& url);
+        void setMediaURL(const LLString& url);
         void    setMediaID(const LLUUID& id) { mMediaID = id; }
         void    setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
         virtual void    setLocalID(S32 local_id);
@@ -257,7 +256,7 @@ public:
         void    setDrawDistance(F32 dist)       { mDrawDistance = dist; }
         void    setSalePrice(S32 price)         { mSalePrice = price; }
         void    setGroupID(const LLUUID& id)    { mGroupID = id; }
-        //void  setGroupName(const char* s)     { mGroupName.assign(s); }
+        //void  setGroupName(const LLString& s) { mGroupName.assign(s); }
         void    setPassPrice(S32 price)                         { mPassPrice = price; }
         void    setPassHours(F32 hours)                         { mPassHours = hours; }
 
@@ -293,10 +292,10 @@ public:
 
         // ACCESSORS
         const LLUUID&   getID() const                           { return mID; }
-        const char*             getName() const                         { return mName.c_str(); }
-        const char*             getDesc() const                         { return mDesc.c_str(); }
-        const char*             getMusicURL() const                     { return mMusicURL.c_str(); }
-        const char*             getMediaURL() const                     { return mMediaURL.c_str(); }
+        const LLString& getName() const                 { return mName; }
+        const LLString& getDesc() const                 { return mDesc; }
+        const LLString& getMusicURL() const             { return mMusicURL; }
+        const LLString& getMediaURL() const             { return mMediaURL; }
         const LLUUID&   getMediaID() const                      { return mMediaID; }
         U8                              getMediaAutoScale() const       { return mMediaAutoScale; }
         S32                             getLocalID() const                      { return mLocalID; }
@@ -568,10 +567,10 @@ protected:
         F32                                     mDrawDistance;
         U32                                     mParcelFlags;
         S32                                     mSalePrice;                             // linden dollars
-        std::string mName;
-        std::string mDesc;
-        std::string mMusicURL;
-        std::string mMediaURL;
+        LLString                        mName;
+        LLString                        mDesc;
+        LLString                        mMusicURL;
+        LLString                        mMediaURL;
         U8                                      mMediaAutoScale;
         LLUUID                          mMediaID;
         S32                                     mPassPrice;
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 0c07b29..d691d4d 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -1,6 +1,8 @@
 /** 
  * @file llparcelflags.h
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #ifndef LL_LLPARCEL_FLAGS_H
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index 925b68f..8f9f73d 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -3,6 +3,8 @@
  * @author Phoenix
  * @brief Permissions for objects and inventory.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * 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"
@@ -1140,6 +1143,12 @@ void mask_to_string(U32 mask, char* str)
         *str = '\0';
 }
 
+std::string mask_to_string(U32 mask)
+{
+        char str[16];
+        mask_to_string(mask, str);
+        return std::string(str);
+}
 
 ///----------------------------------------------------------------------------
 /// exported functions
diff --git a/linden/indra/llinventory/llpermissions.h b/linden/indra/llinventory/llpermissions.h
index 9607a9b..9370d64 100644
--- a/linden/indra/llinventory/llpermissions.h
+++ b/linden/indra/llinventory/llpermissions.h
@@ -2,6 +2,8 @@
  * @file llpermissions.h
  * @brief Permissions structures for objects.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,14 +26,12 @@
  * 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$
  */
 
 #ifndef LL_LLPERMISSIONS_H
 #define LL_LLPERMISSIONS_H
 
-#include <stdio.h>
-#include <iostream>
-
 #include "llpermissionsflags.h"
 #include "llsd.h"
 #include "lluuid.h"
@@ -41,6 +41,7 @@
 // prototypes
 class LLMessageSystem;
 extern void mask_to_string(U32 mask, char* str);
+extern std::string mask_to_string(U32 mask);
 template<class T> class LLMetaClassT;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/linden/indra/llinventory/llpermissionsflags.h b/linden/indra/llinventory/llpermissionsflags.h
index 72778be..87f57e2 100644
--- a/linden/indra/llinventory/llpermissionsflags.h
+++ b/linden/indra/llinventory/llpermissionsflags.h
@@ -1,6 +1,8 @@
 /** 
  * @file llpermissionsflags.h
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #ifndef LL_LLPERMISSIONSFLAGS_H
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 0258259..d0c7c72 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -2,6 +2,8 @@
  * @file llsaleinfo.cpp
  * @brief 
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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 <iostream>
diff --git a/linden/indra/llinventory/llsaleinfo.h b/linden/indra/llinventory/llsaleinfo.h
index fd6429e..e22466b 100644
--- a/linden/indra/llinventory/llsaleinfo.h
+++ b/linden/indra/llinventory/llsaleinfo.h
@@ -2,6 +2,8 @@
  * @file llsaleinfo.h
  * @brief LLSaleInfo class header file.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,14 +26,12 @@
  * 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$
  */
 
 #ifndef LL_LLSALEINFO_H
 #define LL_LLSALEINFO_H
 
-#include <stdio.h>
-#include <iostream>
-
 #include "llpermissionsflags.h"
 #include "llsd.h"
 #include "llxmlnode.h"
diff --git a/linden/indra/llinventory/lltransactionflags.cpp b/linden/indra/llinventory/lltransactionflags.cpp
index ffd3271..d4c97d1 100644
--- a/linden/indra/llinventory/lltransactionflags.cpp
+++ b/linden/indra/llinventory/lltransactionflags.cpp
@@ -3,6 +3,8 @@
  * @brief Some exported symbols and functions for dealing with
  * transaction flags.
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,11 +27,14 @@
  * 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 "lltransactionflags.h"
+#include "lltransactiontypes.h"
+#include "lluuid.h"
  
 const U8 TRANSACTION_FLAGS_NONE = 0;
 const U8 TRANSACTION_FLAG_SOURCE_GROUP = 1;
@@ -61,3 +66,85 @@ BOOL is_tf_owner_group(TransactionFlags flags)
         return ((flags & TRANSACTION_FLAG_OWNER_GROUP) == TRANSACTION_FLAG_OWNER_GROUP);
 }
 
+void append_reason(
+        std::ostream& ostr,
+        S32 transaction_type,
+        const char* description)
+{
+        switch( transaction_type )
+        {
+        case TRANS_OBJECT_SALE:
+                ostr << " for " << (description ? description : "<unknown>");
+                break;
+        case TRANS_LAND_SALE:
+                ostr << " for a parcel of land";
+                break;
+        case TRANS_LAND_PASS_SALE:
+                ostr << " for a land access pass";
+                break;
+        case TRANS_GROUP_LAND_DEED:
+                ostr << " for deeding land";
+        default:
+                break;
+        }
+}
+
+std::string build_transfer_message_to_source(
+        S32 amount,
+        const LLUUID& source_id,
+        const LLUUID& dest_id,
+        const std::string& dest_name,
+        S32 transaction_type,
+        const char* description)
+{
+        lldebugs << "build_transfer_message_to_source: " << amount << " "
+                << source_id << " " << dest_id << " " << dest_name << " "
+                << (description?description:"(no desc)") << llendl;
+        if((0 == amount) || source_id.isNull()) return ll_safe_string(description);
+        std::ostringstream ostr;
+        if(dest_id.isNull())
+        {
+                ostr << "You paid L$" << amount;
+                switch(transaction_type)
+                {
+                case TRANS_GROUP_CREATE:
+                        ostr << " to create a group";
+                        break;
+                case TRANS_GROUP_JOIN:
+                        ostr << " to join a group";
+                        break;
+                case TRANS_UPLOAD_CHARGE:
+                        ostr << " to upload";
+                        break;
+                default:
+                        break;
+                }
+        }
+        else
+        {
+                ostr << "You paid " << dest_name << " L$" << amount;
+                append_reason(ostr, transaction_type, description);
+        }
+        ostr << ".";
+        return ostr.str();
+}
+
+std::string build_transfer_message_to_destination(
+        S32 amount,
+        const LLUUID& dest_id,
+        const LLUUID& source_id,
+        const std::string& source_name,
+        S32 transaction_type,
+        const char* description)
+{
+        lldebugs << "build_transfer_message_to_dest: " << amount << " "
+                << dest_id << " " << source_id << " " << source_name << " "
+                << (description?description:"(no desc)") << llendl;
+        if(0 == amount) return std::string();
+        if(dest_id.isNull()) return ll_safe_string(description);
+        std::ostringstream ostr;
+        ostr << source_name << " paid you L$" << amount;
+        append_reason(ostr, transaction_type, description);
+        ostr << ".";
+        return ostr.str();
+}
diff --git a/linden/indra/llinventory/lltransactionflags.h b/linden/indra/llinventory/lltransactionflags.h
index 3675074..f5ee9d6 100644
--- a/linden/indra/llinventory/lltransactionflags.h
+++ b/linden/indra/llinventory/lltransactionflags.h
@@ -1,6 +1,8 @@
 /** 
  * @file lltransactionflags.h
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #ifndef LL_LLTRANSACTIONFLAGS_H
@@ -44,4 +47,22 @@ BOOL is_tf_source_group(TransactionFlags flags);
 BOOL is_tf_dest_group(TransactionFlags flags);
 BOOL is_tf_owner_group(TransactionFlags flags);
 
+// stupid helper functions which should be replaced with some kind of
+// internationalizeable message.
+std::string build_transfer_message_to_source(
+        S32 amount,
+        const LLUUID& source_id,
+        const LLUUID& dest_id,
+        const std::string& dest_name,
+        S32 transaction_type,
+        const char* description);
+
+std::string build_transfer_message_to_destination(
+        S32 amount,
+        const LLUUID& dest_id,
+        const LLUUID& source_id,
+        const std::string& source_name,
+        S32 transaction_type,
+        const char* description);
+
 #endif // LL_LLTRANSACTIONFLAGS_H
diff --git a/linden/indra/llinventory/lltransactiontypes.h b/linden/indra/llinventory/lltransactiontypes.h
index 6eaced9..8140370 100644
--- a/linden/indra/llinventory/lltransactiontypes.h
+++ b/linden/indra/llinventory/lltransactiontypes.h
@@ -1,6 +1,8 @@
 /** 
  * @file lltransactiontypes.h
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #ifndef LL_LLTRANSACTIONTYPES_H
diff --git a/linden/indra/llinventory/lluserrelations.cpp b/linden/indra/llinventory/lluserrelations.cpp
index 5f01e51..0f1b48e 100644
--- a/linden/indra/llinventory/lluserrelations.cpp
+++ b/linden/indra/llinventory/lluserrelations.cpp
@@ -4,6 +4,8 @@
  * @date 2006-10-12
  * @brief Implementation of a simple cache of user relations.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * 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"
diff --git a/linden/indra/llinventory/lluserrelations.h b/linden/indra/llinventory/lluserrelations.h
index 69f5966..4483013 100644
--- a/linden/indra/llinventory/lluserrelations.h
+++ b/linden/indra/llinventory/lluserrelations.h
@@ -4,6 +4,8 @@
  * @date 2006-10-12
  * @brief Declaration of a class for handling granted rights.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * 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$
  */
 
 #ifndef LL_LLUSERRELAIONS_H