minor: formatting and comments

remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-08-28 12:52:40 +01:00
parent cf58c0ab08
commit d649194be3
5 changed files with 24 additions and 15 deletions

View File

@ -139,15 +139,8 @@ namespace OpenSim.Client.Linden
return m_regionsConnector.RequestNeighbourInfo(homeRegionId); return m_regionsConnector.RequestNeighbourInfo(homeRegionId);
} }
/// <summary> protected override bool PrepareLoginToRegion(
/// Prepare a login to the given region. This involves both telling the region to expect a connection RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
/// and appropriately customising the response to the user.
/// </summary>
/// <param name="sim"></param>
/// <param name="user"></param>
/// <param name="response"></param>
/// <returns>true if the region was successfully contacted, false otherwise</returns>
protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
{ {
IPEndPoint endPoint = regionInfo.ExternalEndPoint; IPEndPoint endPoint = regionInfo.ExternalEndPoint;
response.SimAddress = endPoint.Address.ToString(); response.SimAddress = endPoint.Address.ToString();
@ -204,7 +197,8 @@ namespace OpenSim.Client.Linden
agent.Appearance = m_userManager.GetUserAppearance(user.ID); agent.Appearance = m_userManager.GetUserAppearance(user.ID);
if (agent.Appearance == null) if (agent.Appearance == null)
{ {
m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); m_log.WarnFormat(
"[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
agent.Appearance = new AvatarAppearance(agent.AgentID); agent.Appearance = new AvatarAppearance(agent.AgentID);
} }
@ -243,7 +237,8 @@ namespace OpenSim.Client.Linden
return; return;
} }
m_regionsConnector.LogOffUserFromGrid(SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off"); m_regionsConnector.LogOffUserFromGrid(
SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off");
} }
} }
} }

View File

@ -1063,7 +1063,18 @@ namespace OpenSim.Framework.Communications.Services
protected abstract RegionInfo RequestClosestRegion(string region); protected abstract RegionInfo RequestClosestRegion(string region);
protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle);
protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); protected abstract RegionInfo GetRegionInfo(UUID homeRegionId);
protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
/// <summary>
/// Prepare a login to the given region. This involves both telling the region to expect a connection
/// and appropriately customising the response to the user.
/// </summary>
/// <param name="sim"></param>
/// <param name="user"></param>
/// <param name="response"></param>
/// <param name="remoteClient"></param>
/// <returns>true if the region was successfully contacted, false otherwise</returns>
protected abstract bool PrepareLoginToRegion(
RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
/// <summary> /// <summary>
/// Add active gestures of the user to the login response. /// Add active gestures of the user to the login response.

View File

@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
/// <summary> /// <summary>
/// A Class for folders which contain users inventory /// User inventory folder
/// </summary> /// </summary>
public class InventoryFolderBase : InventoryNodeBase public class InventoryFolderBase : InventoryNodeBase
{ {

View File

@ -135,7 +135,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
item1.AssetID = asset1.FullID; item1.AssetID = asset1.FullID;
item1.ID = item1Id; item1.ID = item1Id;
//userInfo.RootFolder.FindFolderByPath("Objects").ID; //userInfo.RootFolder.FindFolderByPath("Objects").ID;
InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); //InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object);
InventoryFolderBase rootFolder = scene.InventoryService.GetRootFolder(userId);
item1.Folder = objsFolder.ID; item1.Folder = objsFolder.ID;
scene.AddInventoryItem(userId, item1); scene.AddInventoryItem(userId, item1);

View File

@ -535,7 +535,9 @@ namespace OpenSim.Region.Framework.Scenes
} }
UUID newFolderId = UUID.Random(); UUID newFolderId = UUID.Random();
InventoryFolderBase newFolder = new InventoryFolderBase(newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); InventoryFolderBase newFolder
= new InventoryFolderBase(
newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version);
InventoryService.AddFolder(newFolder); InventoryService.AddFolder(newFolder);
// Give all the subfolders // Give all the subfolders