OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.6.8-post-fixes
John Hurliman 2009-09-30 17:51:34 -07:00
parent acfe2d9f4e 606e831ff5
commit cb26878f96
36 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/IUserData.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Data
/// <summary>
/// Get a user from a given uri.
/// </summary>
/// </summary>
/// <param name="uri"></param>
/// <returns>The user data profile. Null if no user is found.</returns>
UserProfileData GetUserByUri(Uri uri);

2
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -497,7 +497,7 @@ namespace OpenSim.Data.Tests
Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
sop.GroupPosition = groupos;
sop.RotationOffset = rotoff;

2
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -219,7 +219,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <summary>
/// Fetch inventory for this user.
/// </summary>
/// This has to be executed as a separate step once user information is retreived.
/// This has to be executed as a separate step once user information is retreived.
/// This will occur synchronously if the inventory service is in the same process as this class, and
/// asynchronously otherwise.
public void FetchInventory()

4
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <summary>
/// Get details of the given user.
/// </summary>
/// If the user isn't in cache then the user is requested from the profile service.
/// If the user isn't in cache then the user is requested from the profile service.
/// <param name="userID"></param>
/// <returns>null if no user details are found</returns>
public CachedUserInfo GetUserDetails(string fname, string lname)
@ -151,7 +151,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <summary>
/// Get details of the given user.
/// </summary>
/// If the user isn't in cache then the user is requested from the profile service.
/// If the user isn't in cache then the user is requested from the profile service.
/// <param name="userID"></param>
/// <returns>null if no user details are found</returns>
public CachedUserInfo GetUserDetails(UUID userID)

2
OpenSim/Framework/Communications/IUserService.cs
View File

@ -128,7 +128,7 @@ namespace OpenSim.Framework.Communications
///
/// <param name="friendlistowner">The agent for whom we're retreiving the friends Data.</param>
/// <returns>
/// A List of FriendListItems that contains info about the user's friends.
/// A List of FriendListItems that contains info about the user's friends.
/// Always returns a list even if the user has no friends
/// </returns>
List<FriendListItem> GetUserFriendList(UUID friendlistowner);

2
OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
View File

@ -35,7 +35,7 @@ using OpenSim.Data;
namespace OpenSim.Framework.Communications
{
/// <summary>
/// Plugin for managing temporary user profiles.
/// Plugin for managing temporary user profiles.
/// </summary>
public class TemporaryUserProfilePlugin : IUserDataPlugin
{

2
OpenSim/Framework/InventoryFolderImpl.cs
View File

@ -314,7 +314,7 @@ namespace OpenSim.Framework
/// FIXME: Delimitors which occur in names themselves are not currently escapable.
///
/// <param name="path">
/// The path to the required folder.
/// The path to the required folder.
/// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
/// </param>
/// <returns>null if the folder is not found</returns>

2
OpenSim/Framework/Serialization/External/LandDataSerializer.cs vendored
View File

@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization.External
xtw.WriteElementString("OwnerID", landData.OwnerID.ToString());
xtw.WriteStartElement("ParcelAccessList");
foreach(ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
{
xtw.WriteStartElement("ParcelAccessEntry");
xtw.WriteElementString("AgentID", pal.AgentID.ToString());

2
OpenSim/Framework/Servers/VersionInfo.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim
public const int VERSIONINFO_VERSION_LENGTH = 27;
/// <value>
/// This is the external interface version. It is separate from the OpenSimulator project version.
/// This is the external interface version. It is separate from the OpenSimulator project version.
///
/// This version number should be
/// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible

2
OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode);
if (!sessionInfo.Authorised)
return false;
return false;
return true;
}

2
OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public int Min
{
get { return m_minAllowableThrottle; }
}
}
public int Current
{

6
OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
View File

@ -233,7 +233,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
TestLLPacketServer testLLPacketServer;
AgentCircuitManager acm;
SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
AddClient(myCircuitCode, testEp, testLLUDPServer, acm);
AddClient(myCircuitCode, testEp, testLLUDPServer, acm);
byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 };
@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
testLLUDPServer.ReceiveData(null);
Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
}
@ -292,7 +292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
}
}

4
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack
/// </summary>
///
/// <param name="osSceneIdentifier">
/// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
/// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
/// </param>
/// <returns></returns>
protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier);
@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack
/// <param name="meshEngine">The name of the mesh engine to use</param>
/// <param name="config">The configuration data to pass to the physics and mesh engines</param>
/// <param name="osSceneIdentifier">
/// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
/// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
/// </param>
/// <returns></returns>
protected PhysicsScene GetPhysicsScene(

2
OpenSim/Region/ClientStack/ThrottleSettings.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack
/// <summary>
/// Maximum bytes per second that the throttle can be set to.
/// </summary>
public int Max;
public int Max;
/// <summary>
/// Current bytes per second that the throttle should be set to.

2
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
m_log.InfoFormat(
"[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
m_scene.RegionInfo.RegionName, firstName, lastName, message);
m_scene.RegionInfo.RegionName, firstName, lastName, message);
SendAlertToUser(firstName, lastName, message, false);
}
}

4
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// User id to search
/// </param>
/// <param name="path">
/// The path to the required folder.
/// The path to the required folder.
/// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
/// </param>
/// <returns>null if the folder is not found</returns>
@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// The folder from which the path starts
/// </param>
/// <param name="path">
/// The path to the required folder.
/// The path to the required folder.
/// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
/// </param>
/// <returns>null if the folder is not found</returns>

2
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
byte[] copyIDBytes = copyID.GetBytes();
im.binaryBucket = new byte[1 + copyIDBytes.Length];
im.binaryBucket[0] = (byte)AssetType.Folder;
Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
if (user != null && !user.IsChildAgent)
{

2
OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
View File

@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land
scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY;
}
/*
/*
else
{
conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize;

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
//private uint PERM_MODIFY = (uint)16384;
private uint PERM_MOVE = (uint)524288;
private uint PERM_TRANS = (uint)8192;
private uint PERM_LOCKED = (uint)540672;
private uint PERM_LOCKED = (uint)540672;
/// <value>
/// Different user set names that come in from the configuration file.

2
OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
View File

@ -90,6 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Sound
p.ControllingClient.SendTriggeredSound(
soundId, ownerID, objectID, parentID, handle, position, (float)gain);
}
}
}
}
}

2
OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
private float m_avgStrength = 5.0f; // Average magnitude of the wind vector
private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
private float m_varStrength = 5.0f; // Max Strength Variance
private float m_varStrength = 5.0f; // Max Strength Variance
private float m_varDirection = 30.0f;// Max Direction Variance
private float m_rateChange = 1.0f; //

4
OpenSim/Region/Framework/Interfaces/IDialogModule.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces
void SendAlertToUser(string firstName, string lastName, string message, bool modal);
/// <summary>
/// Send an alert message to all users in the scene.
/// Send an alert message to all users in the scene.
/// </summary>
/// <param name="message"></param>
void SendGeneralAlert(string message);
@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Interfaces
///
/// <param name="fromAvatarID">The user sending the message</param>
/// <param name="fromAvatarName">The name of the user doing the sending</param>
/// <param name="message">The message being sent to the user</param>
/// <param name="message">The message being sent to the user</param>
void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message);
}
}

2
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// This method occurs asynchronously. If you want notification of when it has completed then subscribe to
/// the EventManager.OnOarFileSaved event.
///
/// <param name="savePath"></param>
/// <param name="savePath"></param>
/// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
void ArchiveRegion(string savePath, Guid requestId);

8
OpenSim/Region/Framework/Scenes/Border.cs
View File

@ -55,11 +55,11 @@ namespace OpenSim.Region.Framework.Scenes
/// Creates a Border. The line is perpendicular to the direction cardinal.
/// IE: if the direction cardinal is South, the line is West->East
/// </summary>
/// <param name="lineStart">The starting point for the line of the border.
/// The position of an object must be greater then this for this border to trigger.
/// <param name="lineStart">The starting point for the line of the border.
/// The position of an object must be greater then this for this border to trigger.
/// Perpendicular to the direction cardinal</param>
/// <param name="lineEnd">The ending point for the line of the border.
/// The position of an object must be less then this for this border to trigger.
/// <param name="lineEnd">The ending point for the line of the border.
/// The position of an object must be less then this for this border to trigger.
/// Perpendicular to the direction cardinal</param>
/// <param name="triggerCoordinate">The position that triggers border the border
/// cross parallel to the direction cardinal. On the North cardinal, this

2
OpenSim/Region/Framework/Scenes/EntityBase.cs
View File

@ -134,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
public abstract void UpdateMovement();
/// <summary>
/// Performs any updates that need to be done at each frame, as opposed to immediately.
/// Performs any updates that need to be done at each frame, as opposed to immediately.
/// These included scheduled updates and updates that occur due to physics processing.
/// </summary>
public abstract void Update();

2
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes
/// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
/// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing,
/// and needs to be changed.
///
///
/// <param name="remoteClient"></param>
/// <param name="folderID"></param>
/// <param name="type"></param>

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3419,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes
/// We've got an update about an agent that sees into this region,
/// send it to ScenePresence for processing It's the full data.
/// </summary>
/// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
/// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
/// Appearance, animations, position, etc.</param>
/// <returns>true if we handled it.</returns>
public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Is this scene object acting as an attachment?
///
/// We return false if the group has already been deleted.
///
///
/// TODO: At the moment set must be done on the part itself. There may be a case for doing it here since I
/// presume either all or no parts in a linkset can be part of an attachment (in which
/// case the value would get proprogated down into all the descendent parts).

6
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
public UUID FromItemID = UUID.Zero;
/// <value>
/// The UUID of the user inventory item from which this object was rezzed if this is a root part.
/// The UUID of the user inventory item from which this object was rezzed if this is a root part.
/// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item.
/// </value>
private UUID m_fromUserInventoryItemID = UUID.Zero;
@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// A relic from when we we thought that prims contained folder objects. In
/// reality, prim == folder
/// reality, prim == folder
/// Exposing this is not particularly good, but it's one of the least evils at the moment to see
/// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
/// </summary>
@ -3386,7 +3386,7 @@ if (m_shape != null) {
}
else
{
IsPhantom = false;
IsPhantom = false;
// If volumedetect is active we don't want phantom to be applied.
// If this is a new call to VD out of the state "phantom"
// this will also cause the prim to be visible to physics

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2313,7 +2313,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!");
// we have to reset the user's child agent connections.
// we have to reset the user's child agent connections.
// Likely, here they've lost the eventqueue for other regions so border
// crossings will fail at this point unless we reset them.

2
OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
View File

@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Assert.That(
// scene.CommsManager.UserAdminService.AddUser(
// "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
// Is.EqualTo(agentId));
// Is.EqualTo(agentId));
// IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);

2
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
View File

@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
{
response = HandleRegister(Context, Realm, request);
}
else if (sipAuthMethod == "INVITE")
else if (sipAuthMethod == "INVITE")
{
response = HandleInvite(Context, Realm, request);
}

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -1261,7 +1261,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{
if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
// TODO: Probably isn't nessesary to update every client in every scene.
// TODO: Probably isn't nessesary to update every client in every scene.
// Need to examine client updates and do only what's nessesary.
lock (m_sceneList)
{

2
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
this.m_maximum_scale = cp.m_maximum_scale;
this.m_initial_scale = cp.m_initial_scale;
this.m_rate = cp.m_rate;
this.m_planted = planted;
this.m_planted = planted;
this.m_trees = new List<UUID>();
}

4
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -178,12 +178,12 @@ namespace OpenSim.Region.Physics.Manager
}
/// <summary>
/// Queue a raycast against the physics scene.
/// Queue a raycast against the physics scene.
/// The provided callback method will be called when the raycast is complete
///
/// Many physics engines don't support collision testing at the same time as
/// manipulating the physics scene, so we queue the request up and callback
/// a custom method when the raycast is complete.
/// a custom method when the raycast is complete.
/// This allows physics engines that give an immediate result to callback immediately
/// and ones that don't, to callback when it gets a result back.
///

2
OpenSim/Server/Base/ProtocolVersions.cs
View File

@ -30,7 +30,7 @@ namespace OpenSim.Server.Base
public class ProtocolVersions
{
/// <value>
/// This is the external protocol versions. It is separate from the OpenSimulator project version.
/// This is the external protocol versions. It is separate from the OpenSimulator project version.
///
/// These version numbers should be increased by 1 every time a code
/// change in the Service.Connectors and Server.Handlers, espectively,