aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/UserLoginService.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-15 19:42:23 +0000
committerJustin Clarke Casey2007-12-15 19:42:23 +0000
commitc63369017f0ac8e204f79978f20d5c2abdf5bef2 (patch)
tree97b26f9efc262bdf0d691e84bf19f2175124984b /OpenSim/Grid/UserServer/UserLoginService.cs
parent* Added support for multiple terrain blocks to be edited at the same time (diff)
downloadopensim-SC_OLD-c63369017f0ac8e204f79978f20d5c2abdf5bef2.zip
opensim-SC_OLD-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.gz
opensim-SC_OLD-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.bz2
opensim-SC_OLD-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.xz
* Make inventory operations sync rather than async. This is to alleviate race conditions such as that in mantis #190
* Make inventory messages more verbose. Hopefully they aren't now too verbose * This may resolve some grid instability but it's likely there's much more out there.
Diffstat (limited to 'OpenSim/Grid/UserServer/UserLoginService.cs')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 02db6d0..ccba1de 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.UserServer
60 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 60 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
61 { 61 {
62 bool tryDefault = false; 62 bool tryDefault = false;
63 System.Console.WriteLine("Load information from the gridserver"); 63 MainLog.Instance.Verbose("LOGIN", "Load information from the gridserver");
64 RegionProfileData SimInfo = new RegionProfileData(); 64 RegionProfileData SimInfo = new RegionProfileData();
65 try 65 try
66 { 66 {
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.UserServer
69 m_config.GridSendKey, m_config.GridRecvKey); 69 m_config.GridSendKey, m_config.GridRecvKey);
70 70
71 // Customise the response 71 // Customise the response
72 System.Console.WriteLine("Home Location"); 72 MainLog.Instance.Verbose("LOGIN", "Home Location");
73 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + 73 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" +
74 (SimInfo.regionLocY * 256).ToString() + "], " + 74 (SimInfo.regionLocY * 256).ToString() + "], " +
75 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + 75 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" +
@@ -128,7 +128,11 @@ namespace OpenSim.Grid.UserServer
128 // Load information from the gridserver 128 // Load information from the gridserver
129 129
130 ulong defaultHandle = (((ulong)m_config.DefaultX * 256) << 32) | ((ulong) m_config.DefaultY * 256); 130 ulong defaultHandle = (((ulong)m_config.DefaultX * 256) << 32) | ((ulong) m_config.DefaultY * 256);
131 MainLog.Instance.Warn("Home region not available: sending to default region " + defaultHandle.ToString()); 131
132 MainLog.Instance.Warn(
133 "LOGIN",
134 "Home region not available: sending to default region " + defaultHandle.ToString());
135
132 SimInfo = new RegionProfileData(); 136 SimInfo = new RegionProfileData();
133 try 137 try
134 { 138 {
@@ -137,7 +141,7 @@ namespace OpenSim.Grid.UserServer
137 m_config.GridSendKey, m_config.GridRecvKey); 141 m_config.GridSendKey, m_config.GridRecvKey);
138 142
139 // Customise the response 143 // Customise the response
140 System.Console.WriteLine("Home Location"); 144 MainLog.Instance.Verbose("LOGIN", "Home Location");
141 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + 145 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" +
142 (SimInfo.regionLocY * 256).ToString() + "], " + 146 (SimInfo.regionLocY * 256).ToString() + "], " +
143 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + 147 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" +
@@ -189,7 +193,7 @@ namespace OpenSim.Grid.UserServer
189 catch (Exception e) 193 catch (Exception e)
190 { 194 {
191 MainLog.Instance.Warn("LOGIN", "Default region also not available"); 195 MainLog.Instance.Warn("LOGIN", "Default region also not available");
192 MainLog.Instance.Verbose("LOGIN", e.ToString()); 196 MainLog.Instance.Warn("LOGIN", e.ToString());
193 } 197 }
194 198
195 } 199 }