From 8b4955f6c1e366f9509b65159cc8c08afa5d237b Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 24 Aug 2007 16:30:27 +0000
Subject: Hopefully fixed the issue of inventory not working for the master
 account. (Note you will need to delete userprofile.yap for this to take
 effect.)

---
 OpenSim/Region/Application/OpenSimMain.cs          | 48 ++++++++++++----------
 .../Communications/Local/LocalUserServices.cs      |  4 ++
 2 files changed, 30 insertions(+), 22 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 07ab34d..ddea383 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -213,28 +213,6 @@ namespace OpenSim
             }
         }
 
-        private void RunCommandScript(string fileName)
-        {
-            MainLog.Instance.Verbose("Running command script (" + fileName + ")");
-            if (File.Exists(fileName))
-            {
-                StreamReader readFile = File.OpenText(fileName);
-                string currentCommand = "";
-                while ((currentCommand = readFile.ReadLine()) != null)
-                {
-                    if (currentCommand != "")
-                    {
-                        MainLog.Instance.Verbose("Running '" + currentCommand + "'");
-                        MainLog.Instance.MainLogRunCommand(currentCommand);
-                    }
-                }
-            }
-            else
-            {
-                MainLog.Instance.Error("Command script missing. Can not run commands");
-            }
-        }
-
         private static void CreateDefaultRegionInfoXml(string fileName)
         {
             new RegionInfo("DEFAULT REGION CONFIG", fileName);
@@ -323,6 +301,32 @@ namespace OpenSim
 
         #region Console Commands
         /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="fileName"></param>
+        private void RunCommandScript(string fileName)
+        {
+            MainLog.Instance.Verbose("Running command script (" + fileName + ")");
+            if (File.Exists(fileName))
+            {
+                StreamReader readFile = File.OpenText(fileName);
+                string currentCommand = "";
+                while ((currentCommand = readFile.ReadLine()) != null)
+                {
+                    if (currentCommand != "")
+                    {
+                        MainLog.Instance.Verbose("Running '" + currentCommand + "'");
+                        MainLog.Instance.MainLogRunCommand(currentCommand);
+                    }
+                }
+            }
+            else
+            {
+                MainLog.Instance.Error("Command script missing. Can not run commands");
+            }
+        }
+
+        /// <summary>
         /// Runs commands issued by the server console from the operator
         /// </summary>
         /// <param name="command">The first argument of the parameter (the command)</param>
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 65732bd..1a409bf 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -63,6 +63,10 @@ namespace OpenSim.Region.Communications.Local
             {
                 Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
             }
+            else
+            {
+                 m_Parent.InvenServices.CreateNewUserInventory(profile.UUID);
+            }
 
             return profile;
         }
-- 
cgit v1.1