Merged working branch of 1.2 into LL 1.23 merge

3 files changed, 14 insertions, 4 deletions

diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 7b010d6..6f9b8c4 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -43,7 +43,8 @@ typedef enum e_chat_source_type
 {
         CHAT_SOURCE_SYSTEM = 0,
         CHAT_SOURCE_AGENT = 1,
-        CHAT_SOURCE_OBJECT = 2
+        CHAT_SOURCE_OBJECT = 2,
+        CHAT_SOURCE_OBJECT_IM = 3
 } EChatSourceType;
 
 typedef enum e_chat_type
@@ -73,6 +74,10 @@ public:
         :       mText(text),
                 mFromName(),
                 mFromID(),
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                mRlvLocFiltered(FALSE),
+                mRlvNamesFiltered(FALSE),
+// [/RLVa:KB]
                 mSourceType(CHAT_SOURCE_AGENT),
                 mChatType(CHAT_TYPE_NORMAL),
                 mAudible(CHAT_AUDIBLE_FULLY),
@@ -81,10 +86,14 @@ public:
                 mPosAgent(),
                 mURL()
         { }
-        
+
         std::string             mText;          // UTF-8 line of text
         std::string             mFromName;      // agent or object name
         LLUUID                  mFromID;        // agent id or object id
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        BOOL                    mRlvLocFiltered;
+        BOOL                    mRlvNamesFiltered;
+// [/RLVa:KB]
         EChatSourceType mSourceType;
         EChatType               mChatType;
         EChatAudible    mAudible;
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 99a9b9e..7db62bc 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -39,6 +39,7 @@
 #include <wctype.h>
 #include <wchar.h>
 #endif
+#include "linden_common.h"
 
 #include <string.h>
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 826111f..bf08879 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -44,8 +44,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 1;
+const S32 IMP_VERSION_MINOR = 2;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "";
+const char * const IMP_VERSION_TEST = "beta 2";
 
 #endif