3 files changed, 12 insertions, 6 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 1f2c54d..a7cffd7 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -139,10 +139,12 @@ namespace OpenSim.Server.Base
                 startupConfig = Config.Configs["Startup"];
             }
 
-            ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
-
-            prompt = startupConfig.GetString("Prompt", prompt);
+            if (startupConfig != null)
+            {
+                ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
 
+                prompt = startupConfig.GetString("Prompt", prompt);
+            }
             // Allow derived classes to load config before the console is opened.
             ReadConfig();
 
diff --git a/OpenSim/Server/Handlers/Land/LandHandlers.cs b/OpenSim/Server/Handlers/Land/LandHandlers.cs
index b45289a..150eaae 100644
--- a/OpenSim/Server/Handlers/Land/LandHandlers.cs
+++ b/OpenSim/Server/Handlers/Land/LandHandlers.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Server.Handlers.Land
             ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);
             uint x = Convert.ToUInt32(requestData["x"]);
             uint y = Convert.ToUInt32(requestData["y"]);
-            m_log.DebugFormat("[LAND HANDLER]: Got request for land data at {0}, {1} for region {2}", x, y, regionHandle);
+//            m_log.DebugFormat("[LAND HANDLER]: Got request for land data at {0}, {1} for region {2}", x, y, regionHandle);
 
             byte regionAccess;
             LandData landData = m_LocalService.GetLandData(UUID.Zero, regionHandle, x, y, out regionAccess);
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 237ffc7..b22c4cc 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -328,12 +328,16 @@ namespace OpenSim.Server.Handlers.UserAccounts
             if (request.ContainsKey("Email"))
                 email = request["Email"].ToString();
 
+            string model = "";
+            if (request.ContainsKey("Model"))
+                model = request["Model"].ToString();
+
             UserAccount createdUserAccount = null;
 
             if (m_UserAccountService is UserAccountService)
                 createdUserAccount
                     = ((UserAccountService)m_UserAccountService).CreateUser(
-                        scopeID, principalID, firstName, lastName, password, email);
+                        scopeID, principalID, firstName, lastName, password, email, model);
 
             if (createdUserAccount == null)
                 return FailureResult();
@@ -393,4 +397,4 @@ namespace OpenSim.Server.Handlers.UserAccounts
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
     }
-}
\ No newline at end of file
+}