diff options
author | Justin Clark-Casey (justincc) | 2009-08-28 12:52:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-08-28 12:52:40 +0100 |
commit | d649194be310bf267675ac3cd9f9fce302cc3798 (patch) | |
tree | e6d79e3cd887a91f48939576ebf6e2467ddc0120 | |
parent | minor: remove some commented out iar test code (diff) | |
download | opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.zip opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.gz opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.bz2 opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.xz |
minor: formatting and comments
5 files changed, 24 insertions, 15 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs index 2a13502..122110d 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs | |||
@@ -139,15 +139,8 @@ namespace OpenSim.Client.Linden | |||
139 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); | 139 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); |
140 | } | 140 | } |
141 | 141 | ||
142 | /// <summary> | 142 | protected override bool PrepareLoginToRegion( |
143 | /// Prepare a login to the given region. This involves both telling the region to expect a connection | 143 | RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient) |
144 | /// and appropriately customising the response to the user. | ||
145 | /// </summary> | ||
146 | /// <param name="sim"></param> | ||
147 | /// <param name="user"></param> | ||
148 | /// <param name="response"></param> | ||
149 | /// <returns>true if the region was successfully contacted, false otherwise</returns> | ||
150 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient) | ||
151 | { | 144 | { |
152 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; | 145 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; |
153 | response.SimAddress = endPoint.Address.ToString(); | 146 | response.SimAddress = endPoint.Address.ToString(); |
@@ -204,7 +197,8 @@ namespace OpenSim.Client.Linden | |||
204 | agent.Appearance = m_userManager.GetUserAppearance(user.ID); | 197 | agent.Appearance = m_userManager.GetUserAppearance(user.ID); |
205 | if (agent.Appearance == null) | 198 | if (agent.Appearance == null) |
206 | { | 199 | { |
207 | m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); | 200 | m_log.WarnFormat( |
201 | "[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); | ||
208 | agent.Appearance = new AvatarAppearance(agent.AgentID); | 202 | agent.Appearance = new AvatarAppearance(agent.AgentID); |
209 | } | 203 | } |
210 | 204 | ||
@@ -243,7 +237,8 @@ namespace OpenSim.Client.Linden | |||
243 | return; | 237 | return; |
244 | } | 238 | } |
245 | 239 | ||
246 | m_regionsConnector.LogOffUserFromGrid(SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off"); | 240 | m_regionsConnector.LogOffUserFromGrid( |
241 | SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off"); | ||
247 | } | 242 | } |
248 | } | 243 | } |
249 | } | 244 | } |
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index cac6616..bf59f8e 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -1063,7 +1063,18 @@ namespace OpenSim.Framework.Communications.Services | |||
1063 | protected abstract RegionInfo RequestClosestRegion(string region); | 1063 | protected abstract RegionInfo RequestClosestRegion(string region); |
1064 | protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); | 1064 | protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); |
1065 | protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); | 1065 | protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); |
1066 | protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client); | 1066 | |
1067 | /// <summary> | ||
1068 | /// Prepare a login to the given region. This involves both telling the region to expect a connection | ||
1069 | /// and appropriately customising the response to the user. | ||
1070 | /// </summary> | ||
1071 | /// <param name="sim"></param> | ||
1072 | /// <param name="user"></param> | ||
1073 | /// <param name="response"></param> | ||
1074 | /// <param name="remoteClient"></param> | ||
1075 | /// <returns>true if the region was successfully contacted, false otherwise</returns> | ||
1076 | protected abstract bool PrepareLoginToRegion( | ||
1077 | RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client); | ||
1067 | 1078 | ||
1068 | /// <summary> | 1079 | /// <summary> |
1069 | /// Add active gestures of the user to the login response. | 1080 | /// Add active gestures of the user to the login response. |
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs index 1869d48..0edb2c6 100644 --- a/OpenSim/Framework/InventoryFolderBase.cs +++ b/OpenSim/Framework/InventoryFolderBase.cs | |||
@@ -30,7 +30,7 @@ using OpenMetaverse; | |||
30 | namespace OpenSim.Framework | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// A Class for folders which contain users inventory | 33 | /// User inventory folder |
34 | /// </summary> | 34 | /// </summary> |
35 | public class InventoryFolderBase : InventoryNodeBase | 35 | public class InventoryFolderBase : InventoryNodeBase |
36 | { | 36 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 8f1ba5c..47a325b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -135,7 +135,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
135 | item1.AssetID = asset1.FullID; | 135 | item1.AssetID = asset1.FullID; |
136 | item1.ID = item1Id; | 136 | item1.ID = item1Id; |
137 | //userInfo.RootFolder.FindFolderByPath("Objects").ID; | 137 | //userInfo.RootFolder.FindFolderByPath("Objects").ID; |
138 | InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); | 138 | //InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); |
139 | InventoryFolderBase rootFolder = scene.InventoryService.GetRootFolder(userId); | ||
139 | item1.Folder = objsFolder.ID; | 140 | item1.Folder = objsFolder.ID; |
140 | scene.AddInventoryItem(userId, item1); | 141 | scene.AddInventoryItem(userId, item1); |
141 | 142 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 3301536..650fc7e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -535,7 +535,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
535 | } | 535 | } |
536 | 536 | ||
537 | UUID newFolderId = UUID.Random(); | 537 | UUID newFolderId = UUID.Random(); |
538 | InventoryFolderBase newFolder = new InventoryFolderBase(newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); | 538 | InventoryFolderBase newFolder |
539 | = new InventoryFolderBase( | ||
540 | newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); | ||
539 | InventoryService.AddFolder(newFolder); | 541 | InventoryService.AddFolder(newFolder); |
540 | 542 | ||
541 | // Give all the subfolders | 543 | // Give all the subfolders |