aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r--OpenSim.Framework/UserProfileManager.cs8
1 files changed, 5 insertions, 3 deletions
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
90 90
91 LLUUID AgentID = TheUser.UUID; 91 LLUUID AgentID = TheUser.UUID;
92 TheUser.InitSessionData(); 92 TheUser.InitSessionData();
93 SimProfile SimInfo = new SimProfile(); 93
94 SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); 94 //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
95 //SimProfile SimInfo = new SimProfile();
96 //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
95 97
96 98
97 Hashtable GlobalT = new Hashtable(); 99 Hashtable GlobalT = new Hashtable();
@@ -146,7 +148,7 @@ namespace OpenSim.Framework.User
146 InitialOutfit.Add(InitialOutfitHash); 148 InitialOutfit.Add(InitialOutfitHash);
147 149
148 uint circode = (uint)(Util.RandomClass.Next()); 150 uint circode = (uint)(Util.RandomClass.Next());
149 TheUser.AddSimCircuit(circode, SimInfo.UUID); 151 //TheUser.AddSimCircuit(circode, SimInfo.UUID);
150 152
151 responseData["last_name"] = TheUser.lastname; 153 responseData["last_name"] = TheUser.lastname;
152 responseData["ui-config"] = ui_config; 154 responseData["ui-config"] = ui_config;