From 97eaae9d8454ade646dbd210bcf0cb521ec6b288 Mon Sep 17 00:00:00 2001
From: OpenSim Master
Date: Mon, 18 Jan 2010 15:50:33 -0800
Subject: * Fixed the Cable Beach inventory server to save the CreatorID as
 well as properly handling null item names and descriptions * Fixed the MySQL
 reader to safely handle null values in string columns that can be null

---
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index f566fde..4b71e39 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -345,8 +345,8 @@ namespace OpenSim.Data.MySQL
                 item.AssetID = new UUID((string) reader["assetID"]);
                 item.AssetType = (int) reader["assetType"];
                 item.Folder = new UUID((string) reader["parentFolderID"]);
-                item.Name = (string) reader["inventoryName"];
-                item.Description = (string) reader["inventoryDescription"];
+                item.Name = (string)(reader["inventoryName"] ?? String.Empty);
+                item.Description = (string)(reader["inventoryDescription"] ?? String.Empty);
                 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
                 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
                 item.InvType = (int) reader["invType"];
-- 
cgit v1.1


From 6392cfcd61a156bda403ee233c322650940df6f7 Mon Sep 17 00:00:00 2001
From: OpenSim Master
Date: Mon, 18 Jan 2010 13:47:41 -0800
Subject: Fixing an incorrect logging message in insertUserRow

---
 OpenSim/Data/MySQL/MySQLManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index a6cce57..243394e 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -778,7 +778,7 @@ namespace OpenSim.Data.MySQL
                                   string aboutText, string firstText,
                                   UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
         {
-            m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString());
+            m_log.Debug("[MySQLManager]: Creating profile for \"" + username + " " + lastname + "\" (" + uuid + ")");
             string sql =
                 "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, `homeRegionID`, ";
             sql +=
-- 
cgit v1.1


From 59f6606ecf4ea7ac3928aec20d1528222961458b Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Sat, 6 Feb 2010 00:37:07 -0500
Subject: Endline fix

---
 .../DynamicTexture/DynamicTextureModule.cs         | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 679c871..e3c7bbf 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -358,18 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // tmptex.DefaultTexture.Fullbright = true;
 
                     part.UpdateTexture(tmptex);
-                }
-
-                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
-                {
-                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
-                    if (oldAsset != null)
-                    {
-                        if (oldAsset.Temporary == true)
-                        {
-                            scene.AssetService.Delete(oldID.ToString());
-                        }
-                    }
+                }
+
+                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
+                {
+                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
+                    if (oldAsset != null)
+                    {
+                        if (oldAsset.Temporary == true)
+                        {
+                            scene.AssetService.Delete(oldID.ToString());
+                        }
+                    }
                 }
             }
 
-- 
cgit v1.1


From fabf10f1cf29a20332f5ab3b5b467a6954a83b34 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Sat, 6 Feb 2010 00:38:22 -0500
Subject: endline fix 2

---
 .../ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 44458d1..fa3681a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -436,12 +436,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             }
 
             OSDMap resp = new OSDMap(2);
-            string reason = String.Empty;
-            uint teleportFlags = 0;
-            if (args.ContainsKey("teleport_flags"))
-            {
-                teleportFlags = args["teleport_flags"].AsUInteger();
-            }
+            string reason = String.Empty;
+            uint teleportFlags = 0;
+            if (args.ContainsKey("teleport_flags"))
+            {
+                teleportFlags = args["teleport_flags"].AsUInteger();
+            }
             
             // This is the meaning of POST agent
             m_regionClient.AdjustUserInformation(aCircuit);
-- 
cgit v1.1