aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorJeff Ames2008-05-16 01:22:11 +0000
committerJeff Ames2008-05-16 01:22:11 +0000
commit65c5efe43b68700bad94076d4cd421160203c5de (patch)
tree589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Communications/Local
parentThank you very much, mjm for : (diff)
downloadopensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs18
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs46
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs10
5 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 39cf911..0203821 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.Communications.Local
165 } 165 }
166 166
167 /// <summary> 167 /// <summary>
168 /// 168 ///
169 /// </summary> 169 /// </summary>
170 /// <param name="regionHandle"></param> 170 /// <param name="regionHandle"></param>
171 /// <returns></returns> 171 /// <returns></returns>
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Communications.Local
188 } 188 }
189 189
190 /// <summary> 190 /// <summary>
191 /// 191 ///
192 /// </summary> 192 /// </summary>
193 /// <param name="minX"></param> 193 /// <param name="minX"></param>
194 /// <param name="minY"></param> 194 /// <param name="minY"></param>
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Communications.Local
305 } 305 }
306 306
307 /// <summary> 307 /// <summary>
308 /// 308 ///
309 /// </summary> 309 /// </summary>
310 /// <param name="regionHandle"></param> 310 /// <param name="regionHandle"></param>
311 /// <param name="agentData"></param> 311 /// <param name="agentData"></param>
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local
338 } 338 }
339 339
340 /// <summary> 340 /// <summary>
341 /// 341 ///
342 /// </summary> 342 /// </summary>
343 /// <param name="regionHandle"></param> 343 /// <param name="regionHandle"></param>
344 /// <param name="agentID"></param> 344 /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 3d87007..4f60462 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -37,20 +37,20 @@ namespace OpenSim.Region.Communications.Local
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// An implementation of user inventory where the inventory is held locally (e.g. when OpenSim is 39 /// An implementation of user inventory where the inventory is held locally (e.g. when OpenSim is
40 /// operating in standalone mode. 40 /// operating in standalone mode.
41 /// </summary> 41 /// </summary>
42 public class LocalInventoryService : InventoryServiceBase 42 public class LocalInventoryService : InventoryServiceBase
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 47 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
48 { 48 {
49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); 49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
50 50
51 List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID); 51 List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID);
52 InventoryFolderImpl rootFolder = null; 52 InventoryFolderImpl rootFolder = null;
53 53
54 List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>(); 54 List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
55 List<InventoryItemBase> items = new List<InventoryItemBase>(); 55 List<InventoryItemBase> items = new List<InventoryItemBase>();
56 56
@@ -76,11 +76,11 @@ namespace OpenSim.Region.Communications.Local
76 } 76 }
77 } 77 }
78 } 78 }
79 79
80 m_log.InfoFormat( 80 m_log.InfoFormat(
81 "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items", 81 "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items",
82 userID, folders.Count, items.Count); 82 userID, folders.Count, items.Count);
83 83
84 callback(folders, items); 84 callback(folders, items);
85 } 85 }
86 86
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 1781ef8..966fdd4 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.Local
41 41
42 public class LocalLoginService : LoginService 42 public class LocalLoginService : LoginService
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private CommunicationsLocal m_Parent; 47 private CommunicationsLocal m_Parent;
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Communications.Local
55 55
56 private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion; 56 private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion;
57 57
58 public LocalLoginService(UserManagerBase userManager, string welcomeMess, 58 public LocalLoginService(UserManagerBase userManager, string welcomeMess,
59 CommunicationsLocal parent, NetworkServersInfo serversInfo, 59 CommunicationsLocal parent, NetworkServersInfo serversInfo,
60 bool authenticate) 60 bool authenticate)
61 : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess) 61 : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess)
62 { 62 {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.Local
106 { 106 {
107 m_log.Info( 107 m_log.Info(
108 "[LOGIN]: Authenticating " + profile.FirstName + " " + profile.SurName); 108 "[LOGIN]: Authenticating " + profile.FirstName + " " + profile.SurName);
109 109
110 if (!password.StartsWith("$1$")) 110 if (!password.StartsWith("$1$"))
111 password = "$1$" + Util.Md5Hash(password); 111 password = "$1$" + Util.Md5Hash(password);
112 112
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Communications.Local
157 RegionInfo r = m_Parent.GridService.RequestClosestRegion(region); 157 RegionInfo r = m_Parent.GridService.RequestClosestRegion(region);
158 if (null == r) 158 if (null == r)
159 { 159 {
160 m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, can't locate region {1}", 160 m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, can't locate region {1}",
161 startLocationRequest, region); 161 startLocationRequest, region);
162 } 162 }
163 else 163 else
@@ -176,16 +176,16 @@ namespace OpenSim.Region.Communications.Local
176 176
177 if ((homeReg != null) && (reg != null)) 177 if ((homeReg != null) && (reg != null))
178 { 178 {
179 response.Home = "{'region_handle':[r" + 179 response.Home = "{'region_handle':[r" +
180 (homeReg.RegionLocX * Constants.RegionSize).ToString() + ",r" + 180 (homeReg.RegionLocX * Constants.RegionSize).ToString() + ",r" +
181 (homeReg.RegionLocY * Constants.RegionSize).ToString() + "], " + 181 (homeReg.RegionLocY * Constants.RegionSize).ToString() + "], " +
182 "'position':[r" + 182 "'position':[r" +
183 theUser.HomeLocation.X.ToString() + ",r" + 183 theUser.HomeLocation.X.ToString() + ",r" +
184 theUser.HomeLocation.Y.ToString() + ",r" + 184 theUser.HomeLocation.Y.ToString() + ",r" +
185 theUser.HomeLocation.Z.ToString() + "], " + 185 theUser.HomeLocation.Z.ToString() + "], " +
186 "'look_at':[r" + 186 "'look_at':[r" +
187 theUser.HomeLocation.X.ToString() + ",r" + 187 theUser.HomeLocation.X.ToString() + ",r" +
188 theUser.HomeLocation.Y.ToString() + ",r" + 188 theUser.HomeLocation.Y.ToString() + ",r" +
189 theUser.HomeLocation.Z.ToString() + "]}"; 189 theUser.HomeLocation.Z.ToString() + "]}";
190 string capsPath = Util.GetRandomCapsPath(); 190 string capsPath = Util.GetRandomCapsPath();
191 response.SimAddress = reg.ExternalEndPoint.Address.ToString(); 191 response.SimAddress = reg.ExternalEndPoint.Address.ToString();
@@ -201,17 +201,17 @@ namespace OpenSim.Region.Communications.Local
201 201
202 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + 202 response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
203 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; 203 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
204 204
205 m_log.DebugFormat( 205 m_log.DebugFormat(
206 "[CAPS]: Sending new CAPS seed url {0} to client {1}", 206 "[CAPS]: Sending new CAPS seed url {0} to client {1}",
207 response.SeedCapability, response.AgentID); 207 response.SeedCapability, response.AgentID);
208 208
209 theUser.CurrentAgent.Region = reg.RegionID; 209 theUser.CurrentAgent.Region = reg.RegionID;
210 theUser.CurrentAgent.Handle = reg.RegionHandle; 210 theUser.CurrentAgent.Handle = reg.RegionHandle;
211 211
212 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); 212 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
213 213
214 response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID)); 214 response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID));
215 215
216 Login _login = new Login(); 216 Login _login = new Login();
217 //copy data to login object 217 //copy data to login object
@@ -228,9 +228,9 @@ namespace OpenSim.Region.Communications.Local
228 _login.CapsPath = capsPath; 228 _login.CapsPath = capsPath;
229 229
230 m_log.InfoFormat( 230 m_log.InfoFormat(
231 "[LOGIN]: Telling region {0} @ {1},{2} ({3}:{4}) to expect user connection", 231 "[LOGIN]: Telling region {0} @ {1},{2} ({3}:{4}) to expect user connection",
232 reg.RegionName, response.RegionX, response.RegionY, response.SimAddress, response.SimPort); 232 reg.RegionName, response.RegionX, response.RegionY, response.SimAddress, response.SimPort);
233 233
234 handlerLoginToRegion = OnLoginToRegion; 234 handlerLoginToRegion = OnLoginToRegion;
235 if (handlerLoginToRegion != null) 235 if (handlerLoginToRegion != null)
236 { 236 {
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Communications.Local
257 return buddylistreturn; 257 return buddylistreturn;
258 } 258 }
259 259
260 // See LoginService 260 // See LoginService
261 protected override InventoryData GetInventorySkeleton(LLUUID userID) 261 protected override InventoryData GetInventorySkeleton(LLUUID userID)
262 { 262 {
263 List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); 263 List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
@@ -265,10 +265,10 @@ namespace OpenSim.Region.Communications.Local
265 // If we have user auth but no inventory folders for some reason, create a new set of folders. 265 // If we have user auth but no inventory folders for some reason, create a new set of folders.
266 if (null == folders || 0 == folders.Count) 266 if (null == folders || 0 == folders.Count)
267 { 267 {
268 m_Parent.InventoryService.CreateNewUserInventory(userID); 268 m_Parent.InventoryService.CreateNewUserInventory(userID);
269 folders = m_Parent.InventoryService.GetInventorySkeleton(userID); 269 folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
270 } 270 }
271 271
272 LLUUID rootID = LLUUID.Zero; 272 LLUUID rootID = LLUUID.Zero;
273 ArrayList AgentInventoryArray = new ArrayList(); 273 ArrayList AgentInventoryArray = new ArrayList();
274 Hashtable TempHash; 274 Hashtable TempHash;
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Communications.Local
286 TempHash["folder_id"] = InvFolder.ID.ToString(); 286 TempHash["folder_id"] = InvFolder.ID.ToString();
287 AgentInventoryArray.Add(TempHash); 287 AgentInventoryArray.Add(TempHash);
288 } 288 }
289 289
290 return new InventoryData(AgentInventoryArray, rootID); 290 return new InventoryData(AgentInventoryArray, rootID);
291 } 291 }
292 } 292 }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 2a66edc..47f596d 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.Local
40 private IInventoryServices m_inventoryService; 40 private IInventoryServices m_inventoryService;
41 41
42 /// <summary> 42 /// <summary>
43 /// 43 ///
44 /// </summary> 44 /// </summary>
45 /// <param name="serversInfo"></param> 45 /// <param name="serversInfo"></param>
46 /// <param name="defaultHomeLocX"></param> 46 /// <param name="defaultHomeLocX"></param>
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 2c88586..8712c00 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
61// You can specify all the values or you can default the Revision and Build Numbers 61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below: 62// by using the '*' as shown below:
63 63
64[assembly : AssemblyVersion("1.0.0.0")] 64[assembly : AssemblyVersion("1.0.0.0")]