aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs20
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs63
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs21
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs49
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs8
-rw-r--r--OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs31
6 files changed, 97 insertions, 95 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index ef5150f..eac293e 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -25,32 +25,30 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using OpenSim.Framework;
28using OpenSim.Framework.Communications; 29using OpenSim.Framework.Communications;
29using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
30using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
31using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
32using OpenSim.Framework;
33 33
34namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
35{ 35{
36 public class CommunicationsLocal : CommunicationsManager 36 public class CommunicationsLocal : CommunicationsManager
37 { 37 {
38 public CommunicationsLocal( 38 public CommunicationsLocal(
39 NetworkServersInfo serversInfo, 39 NetworkServersInfo serversInfo,
40 BaseHttpServer httpServer, 40 BaseHttpServer httpServer,
41 AssetCache assetCache, 41 AssetCache assetCache,
42 IUserService userService, 42 IUserService userService,
43 LocalInventoryService inventoryService, 43 LocalInventoryService inventoryService,
44 IInterRegionCommunications interRegionService, 44 IInterRegionCommunications interRegionService,
45 IGridServices gridService, bool dumpAssetsToFile ) 45 IGridServices gridService, bool dumpAssetsToFile)
46 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile) 46 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
47 { 47 {
48 m_inventoryService = inventoryService; 48 m_inventoryService = inventoryService;
49 m_userService = userService; 49 m_userService = userService;
50 m_gridService = gridService; 50 m_gridService = gridService;
51 m_interRegion = interRegionService; 51 m_interRegion = interRegionService;
52
53 } 52 }
54
55 } 53 }
56} 54} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 99c4bc3..3a0b47f 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,25 +25,25 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System.Collections;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using libsecondlife; 30using libsecondlife;
30using OpenSim.Framework; 31using OpenSim.Framework;
31using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
32using OpenSim.Framework;
33using System.Collections;
34 33
35namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
36{ 35{
37
38 public class LocalBackEndServices : IGridServices, IInterRegionCommunications 36 public class LocalBackEndServices : IGridServices, IInterRegionCommunications
39 { 37 {
40 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); 38 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
41 protected Dictionary<ulong, RegionCommsListener> m_regionListeners = new Dictionary<ulong, RegionCommsListener>(); 39
40 protected Dictionary<ulong, RegionCommsListener> m_regionListeners =
41 new Dictionary<ulong, RegionCommsListener>();
42
42 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); 43 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
43 44
44 public LocalBackEndServices() 45 public LocalBackEndServices()
45 { 46 {
46
47 } 47 }
48 48
49 /// <summary> 49 /// <summary>
@@ -54,13 +54,13 @@ namespace OpenSim.Region.Communications.Local
54 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 54 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
55 { 55 {
56 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); 56 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
57 if (!this.m_regions.ContainsKey((uint)regionInfo.RegionHandle)) 57 if (!m_regions.ContainsKey((uint) regionInfo.RegionHandle))
58 { 58 {
59 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle ); 59 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
60 this.m_regions.Add(regionInfo.RegionHandle, regionInfo); 60 m_regions.Add(regionInfo.RegionHandle, regionInfo);
61 61
62 RegionCommsListener regionHost = new RegionCommsListener(); 62 RegionCommsListener regionHost = new RegionCommsListener();
63 this.m_regionListeners.Add(regionInfo.RegionHandle, regionHost); 63 m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
64 64
65 return regionHost; 65 return regionHost;
66 } 66 }
@@ -103,9 +103,9 @@ namespace OpenSim.Region.Communications.Local
103 /// <returns></returns> 103 /// <returns></returns>
104 public RegionInfo RequestNeighbourInfo(ulong regionHandle) 104 public RegionInfo RequestNeighbourInfo(ulong regionHandle)
105 { 105 {
106 if (this.m_regions.ContainsKey(regionHandle)) 106 if (m_regions.ContainsKey(regionHandle))
107 { 107 {
108 return this.m_regions[regionHandle]; 108 return m_regions[regionHandle];
109 } 109 }
110 return null; 110 return null;
111 } 111 }
@@ -121,16 +121,18 @@ namespace OpenSim.Region.Communications.Local
121 public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY) 121 public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
122 { 122 {
123 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 123 List<MapBlockData> mapBlocks = new List<MapBlockData>();
124 foreach (RegionInfo regInfo in this.m_regions.Values) 124 foreach (RegionInfo regInfo in m_regions.Values)
125 { 125 {
126 if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY))) 126 if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) &&
127 ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
127 { 128 {
128 MapBlockData map = new MapBlockData(); 129 MapBlockData map = new MapBlockData();
129 map.Name = regInfo.RegionName; 130 map.Name = regInfo.RegionName;
130 map.X = (ushort)regInfo.RegionLocX; 131 map.X = (ushort) regInfo.RegionLocX;
131 map.Y = (ushort)regInfo.RegionLocY; 132 map.Y = (ushort) regInfo.RegionLocY;
132 map.WaterHeight = (byte)regInfo.EstateSettings.waterHeight; 133 map.WaterHeight = (byte) regInfo.EstateSettings.waterHeight;
133 map.MapImageId = regInfo.EstateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007"); 134 map.MapImageId = regInfo.EstateSettings.terrainImageID;
135 //new LLUUID("00000000-0000-0000-9999-000000000007");
134 map.Agents = 1; 136 map.Agents = 1;
135 map.RegionFlags = 72458694; 137 map.RegionFlags = 72458694;
136 map.Access = 13; 138 map.Access = 13;
@@ -145,13 +147,14 @@ namespace OpenSim.Region.Communications.Local
145 /// <param name="regionHandle"></param> 147 /// <param name="regionHandle"></param>
146 /// <param name="agentData"></param> 148 /// <param name="agentData"></param>
147 /// <returns></returns> 149 /// <returns></returns>
148 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData 150 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
151 //should change from agentCircuitData
149 { 152 {
150 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 153 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
151 if (this.m_regionListeners.ContainsKey(regionHandle)) 154 if (m_regionListeners.ContainsKey(regionHandle))
152 { 155 {
153 // Console.WriteLine("CommsManager- Informing a region to expect child agent"); 156 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
154 this.m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); 157 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
155 return true; 158 return true;
156 } 159 }
157 return false; 160 return false;
@@ -166,10 +169,10 @@ namespace OpenSim.Region.Communications.Local
166 /// <returns></returns> 169 /// <returns></returns>
167 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 170 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
168 { 171 {
169 if (this.m_regionListeners.ContainsKey(regionHandle)) 172 if (m_regionListeners.ContainsKey(regionHandle))
170 { 173 {
171 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing"); 174 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
172 this.m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying); 175 m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
173 return true; 176 return true;
174 } 177 }
175 return false; 178 return false;
@@ -177,7 +180,7 @@ namespace OpenSim.Region.Communications.Local
177 180
178 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) 181 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
179 { 182 {
180 if (this.m_regionListeners.ContainsKey(regionHandle)) 183 if (m_regionListeners.ContainsKey(regionHandle))
181 { 184 {
182 return true; 185 return true;
183 } 186 }
@@ -210,15 +213,15 @@ namespace OpenSim.Region.Communications.Local
210 213
211 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 214 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
212 { 215 {
213 if (this.m_regionListeners.ContainsKey(regionHandle)) 216 if (m_regionListeners.ContainsKey(regionHandle))
214 { 217 {
215 this.m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); 218 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
216 } 219 }
217 } 220 }
218 221
219 public void PingCheckReply(Hashtable respData) 222 public void PingCheckReply(Hashtable respData)
220 { 223 {
221 foreach (ulong region in this.m_regions.Keys) 224 foreach (ulong region in m_regions.Keys)
222 { 225 {
223 Hashtable regData = new Hashtable(); 226 Hashtable regData = new Hashtable();
224 RegionInfo reg = m_regions[region]; 227 RegionInfo reg = m_regions[region];
@@ -234,7 +237,7 @@ namespace OpenSim.Region.Communications.Local
234 if (m_regionListeners.ContainsKey(regionHandle)) 237 if (m_regionListeners.ContainsKey(regionHandle))
235 { 238 {
236 return m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, 239 return m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position,
237 isFlying); 240 isFlying);
238 } 241 }
239 242
240 return false; 243 return false;
@@ -250,11 +253,5 @@ namespace OpenSim.Region.Communications.Local
250 253
251 return false; 254 return false;
252 } 255 }
253
254
255
256 } 256 }
257} 257} \ No newline at end of file
258
259
260
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index b7d78bc..c38e922 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -28,29 +28,28 @@
28 28
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework;
31using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework;
34 34
35namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
36{ 36{
37 public class LocalInventoryService : InventoryServiceBase 37 public class LocalInventoryService : InventoryServiceBase
38 { 38 {
39
40 public LocalInventoryService() 39 public LocalInventoryService()
41 { 40 {
42
43 } 41 }
44 42
45 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) 43 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
44 InventoryItemInfo itemCallBack)
46 { 45 {
47 List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); 46 List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
48 InventoryFolderImpl rootFolder = null; 47 InventoryFolderImpl rootFolder = null;
49 48
50 //need to make sure we send root folder first 49 //need to make sure we send root folder first
51 foreach (InventoryFolderBase folder in folders) 50 foreach (InventoryFolderBase folder in folders)
52 { 51 {
53 if (folder.parentID == libsecondlife.LLUUID.Zero) 52 if (folder.parentID == LLUUID.Zero)
54 { 53 {
55 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 54 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
56 rootFolder = newfolder; 55 rootFolder = newfolder;
@@ -67,7 +66,7 @@ namespace OpenSim.Region.Communications.Local
67 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 66 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
68 folderCallBack(userID, newfolder); 67 folderCallBack(userID, newfolder);
69 68
70 List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); 69 List<InventoryItemBase> items = RequestFolderItems(newfolder.folderID);
71 foreach (InventoryItemBase item in items) 70 foreach (InventoryItemBase item in items)
72 { 71 {
73 itemCallBack(userID, item); 72 itemCallBack(userID, item);
@@ -79,17 +78,17 @@ namespace OpenSim.Region.Communications.Local
79 78
80 public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) 79 public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
81 { 80 {
82 this.AddFolder(folder); 81 AddFolder(folder);
83 } 82 }
84 83
85 public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) 84 public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
86 { 85 {
87 this.AddItem(item); 86 AddItem(item);
88 } 87 }
89 88
90 public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) 89 public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
91 { 90 {
92 this.deleteItem(item); 91 deleteItem(item);
93 } 92 }
94 } 93 }
95} 94} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 1043683..aa1a0d9 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,9 +30,9 @@ using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Communications;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.UserManagement; 34using OpenSim.Framework.UserManagement;
35using InventoryFolder=OpenSim.Framework.InventoryFolder;
36 36
37namespace OpenSim.Region.Communications.Local 37namespace OpenSim.Region.Communications.Local
38{ 38{
@@ -49,23 +49,23 @@ namespace OpenSim.Region.Communications.Local
49 49
50 public event LoginToRegionEvent OnLoginToRegion; 50 public event LoginToRegionEvent OnLoginToRegion;
51 51
52 public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent, NetworkServersInfo serversInfo, bool authenticate) 52 public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent,
53 NetworkServersInfo serversInfo, bool authenticate)
53 : base(userManager, welcomeMess) 54 : base(userManager, welcomeMess)
54 { 55 {
55 m_Parent = parent; 56 m_Parent = parent;
56 this.serversInfo = serversInfo; 57 this.serversInfo = serversInfo;
57 defaultHomeX = this.serversInfo.DefaultHomeLocX; 58 defaultHomeX = this.serversInfo.DefaultHomeLocX;
58 defaultHomeY = this.serversInfo.DefaultHomeLocY; 59 defaultHomeY = this.serversInfo.DefaultHomeLocY;
59 this.authUsers = authenticate; 60 authUsers = authenticate;
60 } 61 }
61 62
62 63
63 public override UserProfileData GetTheUser(string firstname, string lastname) 64 public override UserProfileData GetTheUser(string firstname, string lastname)
64 { 65 {
65 UserProfileData profile = this.m_userManager.GetUserProfile(firstname, lastname); 66 UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname);
66 if (profile != null) 67 if (profile != null)
67 { 68 {
68
69 return profile; 69 return profile;
70 } 70 }
71 71
@@ -73,9 +73,9 @@ namespace OpenSim.Region.Communications.Local
73 { 73 {
74 //no current user account so make one 74 //no current user account so make one
75 Console.WriteLine("No User account found so creating a new one "); 75 Console.WriteLine("No User account found so creating a new one ");
76 this.m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); 76 m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
77 77
78 profile = this.m_userManager.GetUserProfile(firstname, lastname); 78 profile = m_userManager.GetUserProfile(firstname, lastname);
79 if (profile != null) 79 if (profile != null)
80 { 80 {
81 m_Parent.InventoryService.CreateNewUserInventory(profile.UUID); 81 m_Parent.InventoryService.CreateNewUserInventory(profile.UUID);
@@ -113,18 +113,22 @@ namespace OpenSim.Region.Communications.Local
113 113
114 if (reg != null) 114 if (reg != null)
115 { 115 {
116 response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + 116 response.Home = "{'region_handle':[r" + (reg.RegionLocX*256).ToString() + ",r" +
117 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 117 (reg.RegionLocY*256).ToString() + "], " +
118 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 118 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" +
119 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
120 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" +
121 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
119 string capsPath = Util.GetRandomCapsPath(); 122 string capsPath = Util.GetRandomCapsPath();
120 response.SimAddress = reg.ExternalEndPoint.Address.ToString(); 123 response.SimAddress = reg.ExternalEndPoint.Address.ToString();
121 response.SimPort = (Int32)reg.ExternalEndPoint.Port; 124 response.SimPort = (Int32) reg.ExternalEndPoint.Port;
122 response.RegionX = reg.RegionLocX; 125 response.RegionX = reg.RegionLocX;
123 response.RegionY = reg.RegionLocY; 126 response.RegionY = reg.RegionLocY;
124
125 127
126 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; 128
127 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; 129 response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
130 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
131 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
128 theUser.currentAgent.currentRegion = reg.RegionID; 132 theUser.currentAgent.currentRegion = reg.RegionID;
129 theUser.currentAgent.currentHandle = reg.RegionHandle; 133 theUser.currentAgent.currentHandle = reg.RegionHandle;
130 134
@@ -135,11 +139,11 @@ namespace OpenSim.Region.Communications.Local
135 _login.Agent = response.AgentID; 139 _login.Agent = response.AgentID;
136 _login.Session = response.SessionID; 140 _login.Session = response.SessionID;
137 _login.SecureSession = response.SecureSessionID; 141 _login.SecureSession = response.SecureSessionID;
138 _login.CircuitCode = (uint)response.CircuitCode; 142 _login.CircuitCode = (uint) response.CircuitCode;
139 _login.StartPos = new LLVector3(128, 128, 70); 143 _login.StartPos = new LLVector3(128, 128, 70);
140 _login.CapsPath = capsPath; 144 _login.CapsPath = capsPath;
141 145
142 if( OnLoginToRegion != null ) 146 if (OnLoginToRegion != null)
143 { 147 {
144 OnLoginToRegion(currentRegion, _login); 148 OnLoginToRegion(currentRegion, _login);
145 } 149 }
@@ -148,7 +152,6 @@ namespace OpenSim.Region.Communications.Local
148 { 152 {
149 Console.WriteLine("not found region " + currentRegion); 153 Console.WriteLine("not found region " + currentRegion);
150 } 154 }
151
152 } 155 }
153 156
154 protected override InventoryData CreateInventoryData(LLUUID userID) 157 protected override InventoryData CreateInventoryData(LLUUID userID)
@@ -168,8 +171,8 @@ namespace OpenSim.Region.Communications.Local
168 TempHash = new Hashtable(); 171 TempHash = new Hashtable();
169 TempHash["name"] = InvFolder.name; 172 TempHash["name"] = InvFolder.name;
170 TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); 173 TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated();
171 TempHash["version"] = (Int32)InvFolder.version; 174 TempHash["version"] = (Int32) InvFolder.version;
172 TempHash["type_default"] = (Int32)InvFolder.type; 175 TempHash["type_default"] = (Int32) InvFolder.type;
173 TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); 176 TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated();
174 AgentInventoryArray.Add(TempHash); 177 AgentInventoryArray.Add(TempHash);
175 } 178 }
@@ -182,13 +185,13 @@ namespace OpenSim.Region.Communications.Local
182 185
183 ArrayList AgentInventoryArray = new ArrayList(); 186 ArrayList AgentInventoryArray = new ArrayList();
184 Hashtable TempHash; 187 Hashtable TempHash;
185 foreach (OpenSim.Framework.InventoryFolder InvFolder in userInventory.InventoryFolders.Values) 188 foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
186 { 189 {
187 TempHash = new Hashtable(); 190 TempHash = new Hashtable();
188 TempHash["name"] = InvFolder.FolderName; 191 TempHash["name"] = InvFolder.FolderName;
189 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 192 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
190 TempHash["version"] = (Int32)InvFolder.Version; 193 TempHash["version"] = (Int32) InvFolder.Version;
191 TempHash["type_default"] = (Int32)InvFolder.DefaultType; 194 TempHash["type_default"] = (Int32) InvFolder.DefaultType;
192 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 195 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
193 AgentInventoryArray.Add(TempHash); 196 AgentInventoryArray.Add(TempHash);
194 } 197 }
@@ -197,4 +200,4 @@ namespace OpenSim.Region.Communications.Local
197 } 200 }
198 } 201 }
199 } 202 }
200} 203} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 1dede97..a7687c7 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -27,8 +27,8 @@
27*/ 27*/
28 28
29using System; 29using System;
30using OpenSim.Framework.Communications;
31using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications;
32using OpenSim.Framework.UserManagement; 32using OpenSim.Framework.UserManagement;
33 33
34namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
@@ -41,7 +41,8 @@ namespace OpenSim.Region.Communications.Local
41 private IInventoryServices m_inventoryService; 41 private IInventoryServices m_inventoryService;
42 42
43 43
44 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, IInventoryServices inventoryService) 44 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
45 IInventoryServices inventoryService)
45 { 46 {
46 m_serversInfo = serversInfo; 47 m_serversInfo = serversInfo;
47 48
@@ -49,7 +50,6 @@ namespace OpenSim.Region.Communications.Local
49 m_defaultHomeY = defaultHomeLocY; 50 m_defaultHomeY = defaultHomeLocY;
50 51
51 m_inventoryService = inventoryService; 52 m_inventoryService = inventoryService;
52
53 } 53 }
54 54
55 public override UserProfileData SetupMasterUser(string firstName, string lastName) 55 public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,4 +82,4 @@ namespace OpenSim.Region.Communications.Local
82 return profile; 82 return profile;
83 } 83 }
84 } 84 }
85} 85} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index ca64319..481577e 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,24 +1,28 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
3
3// General Information about an assembly is controlled through the following 4// General Information about an assembly is controlled through the following
4// set of attributes. Change these attribute values to modify the information 5// set of attributes. Change these attribute values to modify the information
5// associated with an assembly. 6// associated with an assembly.
6[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")] 7
7[assembly: AssemblyDescription("")] 8[assembly : AssemblyTitle("OpenSim.Region.Communications.Local")]
8[assembly: AssemblyConfiguration("")] 9[assembly : AssemblyDescription("")]
9[assembly: AssemblyCompany("")] 10[assembly : AssemblyConfiguration("")]
10[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")] 11[assembly : AssemblyCompany("")]
11[assembly: AssemblyCopyright("Copyright © 2007")] 12[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")]
12[assembly: AssemblyTrademark("")] 13[assembly : AssemblyCopyright("Copyright © 2007")]
13[assembly: AssemblyCulture("")] 14[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")]
14 16
15// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
16// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
17// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
18[assembly: ComVisible(false)] 20
21[assembly : ComVisible(false)]
19 22
20// The following GUID is for the ID of the typelib if this project is exposed to COM 23// The following GUID is for the ID of the typelib if this project is exposed to COM
21[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")] 24
25[assembly : Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
22 26
23// Version information for an assembly consists of the following four values: 27// Version information for an assembly consists of the following four values:
24// 28//
@@ -29,5 +33,6 @@ using System.Runtime.InteropServices;
29// 33//
30// You can specify all the values or you can default the Revision and Build Numbers 34// You can specify all the values or you can default the Revision and Build Numbers
31// by using the '*' as shown below: 35// by using the '*' as shown below:
32[assembly: AssemblyVersion("1.0.0.0")] 36
33[assembly: AssemblyFileVersion("1.0.0.0")] 37[assembly : AssemblyVersion("1.0.0.0")]
38[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file