Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp

indra/newview/app_settings/settings.xml

@@ -8,6 +8,30 @@
 		<string>settings_sh.xml</string>
 		<string>settings_rlv.xml</string>
 	</array>
+	
+	<key>SianaRenderDeferredInvisiprim</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Support invisiprims in deferred mode</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>Boolean</string>
+	  <key>Value</key>
+	  <integer>1</integer>
+	</map>
+
+  <key>SGAbsolutePointer</key>
+  <map>
+	<key>Comment</key>
+	<string>Support pen tablets and absolute pointer devices by disabling mouse wrapping</string>
+	<key>Persist</key>
+	<integer>1</integer>
+	<key>Type</key>
+	<string>Boolean</string>
+	<key>Value</key>
+	<integer>0</integer>
+  </map>
 
   <key>WaterPresetName</key>
   <map>
@@ -4225,6 +4249,17 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
+    <key>DebugStatModeMalloc</key>
+    <map>
+      <key>Comment</key>
+      <string>Mode of stat in Statistics floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>-1</integer>
+    </map>    
     <key>DebugStatModeFormattedMem</key>
     <map>
       <key>Comment</key>
@@ -8198,7 +8233,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+	  <integer>0</integer>
     </map>
     <key>MemoryPrivatePoolSize</key>
     <map>