From 435d61661bb4a80f04304968feac5f2828cda104 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 11 Apr 2007 09:29:06 +0000
Subject: 

---
 OpenSim.Framework/UserProfileManager.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim.Framework/UserProfileManager.cs')

diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 38ca5df..3f0d665 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -90,8 +90,10 @@ namespace OpenSim.Framework.User
 
                     LLUUID AgentID = TheUser.UUID;
                     TheUser.InitSessionData();
-                    SimProfile SimInfo = new SimProfile();
-                    SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
+
+                    //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
+                   //SimProfile SimInfo = new SimProfile();
+                    //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
 
 
                     Hashtable GlobalT = new Hashtable();
@@ -146,7 +148,7 @@ namespace OpenSim.Framework.User
                     InitialOutfit.Add(InitialOutfitHash);
 
                     uint circode = (uint)(Util.RandomClass.Next());
-                    TheUser.AddSimCircuit(circode, SimInfo.UUID);
+                    //TheUser.AddSimCircuit(circode, SimInfo.UUID);
 
                     responseData["last_name"] = TheUser.lastname;
                     responseData["ui-config"] = ui_config;
-- 
cgit v1.1