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

Update svn properties. Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-10 08:35:46 +00:00
parent 8a93358405
commit 5910a49da6
9 changed files with 63 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Data/Migration.cs
View File

@ -121,10 +121,14 @@ namespace OpenSim.Data
} }
newversion = MaxVersion(); newversion = MaxVersion();
if (newversion > version) { if (newversion > version)
if (version == 0) { {
if (version == 0)
{
InsertVersion(_type, newversion); InsertVersion(_type, newversion);
} else { }
else
{
UpdateVersion(_type, newversion); UpdateVersion(_type, newversion);
} }
} }
@ -144,7 +148,7 @@ namespace OpenSim.Data
if (m.Success) if (m.Success)
{ {
int MigrationVersion = int.Parse(m.Groups[1].ToString()); int MigrationVersion = int.Parse(m.Groups[1].ToString());
if ( MigrationVersion > max ) if (MigrationVersion > max)
max = MigrationVersion; max = MigrationVersion;
} }
} }
@ -155,7 +159,8 @@ namespace OpenSim.Data
{ {
int version = 0; int version = 0;
DbCommand cmd = _conn.CreateCommand(); DbCommand cmd = _conn.CreateCommand();
try { try
{
cmd.CommandText = "select version from migrations where name='" + type + "' limit 1"; cmd.CommandText = "select version from migrations where name='" + type + "' limit 1";
using (IDataReader reader = cmd.ExecuteReader()) using (IDataReader reader = cmd.ExecuteReader())
{ {
@ -165,7 +170,9 @@ namespace OpenSim.Data
} }
reader.Close(); reader.Close();
} }
} catch { }
catch
{
// Something went wrong, so we're version 0 // Something went wrong, so we're version 0
} }
return version; return version;
@ -218,7 +225,8 @@ namespace OpenSim.Data
} }
// TODO: once this is working, get rid of this // TODO: once this is working, get rid of this
if (migrations.Count < 1) { if (migrations.Count < 1)
{
m_log.InfoFormat("Resource '{0}' was not found", _type); m_log.InfoFormat("Resource '{0}' was not found", _type);
} }
return migrations; return migrations;

4
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -231,9 +231,8 @@ namespace OpenSim.Framework.Console
try try
{ {
string line = System.Console.ReadLine(); string line = System.Console.ReadLine();
while(line == null) while (line == null)
{ {
line = System.Console.ReadLine(); line = System.Console.ReadLine();
} }
@ -365,7 +364,6 @@ namespace OpenSim.Framework.Console
{ {
string tempstr = CmdPrompt(m_componentName + "# "); string tempstr = CmdPrompt(m_componentName + "# ");
RunCommand(tempstr); RunCommand(tempstr);
} }
public void RunCommand(string cmdline) public void RunCommand(string cmdline)

3
OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -100,7 +100,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
xtw.WriteEndElement(); xtw.WriteEndElement();
} }
} }
xtw.WriteEndElement(); xtw.WriteEndElement();

44
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1391,7 +1391,6 @@ namespace OpenSim.Region.Environment.Scenes
// distance2 = (float)GetDistanceTo(q, iray.Origin); // distance2 = (float)GetDistanceTo(q, iray.Origin);
//} //}
if (distance2 < returnresult.distance) if (distance2 < returnresult.distance)
{ {
returnresult.distance = distance2; returnresult.distance = distance2;
@ -1410,8 +1409,8 @@ namespace OpenSim.Region.Environment.Scenes
if (scaleComponent.y != 0) ScaleOffset = AXscale.y; if (scaleComponent.y != 0) ScaleOffset = AXscale.y;
if (scaleComponent.z != 0) ScaleOffset = AXscale.z; if (scaleComponent.z != 0) ScaleOffset = AXscale.z;
ScaleOffset = Math.Abs(ScaleOffset); ScaleOffset = Math.Abs(ScaleOffset);
Vector3 offset = (returnresult.normal * ScaleOffset); Vector3 offset = returnresult.normal * ScaleOffset;
returnresult.ipoint = (AXpos + offset ); returnresult.ipoint = AXpos + offset;
///pos = (intersectionpoint + offset); ///pos = (intersectionpoint + offset);
} }
@ -1420,10 +1419,8 @@ namespace OpenSim.Region.Environment.Scenes
returnresult.normal = normals[i]; returnresult.normal = normals[i];
} }
returnresult.AAfaceNormal = AAfacenormals[i]; returnresult.AAfaceNormal = AAfacenormals[i];
} }
} }
} }
return returnresult; return returnresult;
} }
@ -1443,8 +1440,8 @@ namespace OpenSim.Region.Environment.Scenes
//{ //{
m_shape.State = (byte)AttachmentPoint; m_shape.State = (byte)AttachmentPoint;
//} //}
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -1472,7 +1469,6 @@ namespace OpenSim.Region.Environment.Scenes
if (m_parentGroup != null) if (m_parentGroup != null)
{ {
m_parentGroup.SetAxisRotation(axis, rotate); m_parentGroup.SetAxisRotation(axis, rotate);
} }
} }
@ -1494,11 +1490,9 @@ namespace OpenSim.Region.Environment.Scenes
{ {
PhysActor.FloatOnWater = false; PhysActor.FloatOnWater = false;
} }
} }
} }
public LLVector3 GetSitTargetPositionLL() public LLVector3 GetSitTargetPositionLL()
{ {
return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z); return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z);
@ -1544,7 +1538,6 @@ namespace OpenSim.Region.Environment.Scenes
return m_sitTargetAvatar; return m_sitTargetAvatar;
} }
public LLUUID GetRootPartUUID() public LLUUID GetRootPartUUID()
{ {
if (m_parentGroup != null) if (m_parentGroup != null)
@ -1797,8 +1790,6 @@ namespace OpenSim.Region.Environment.Scenes
public void UpdatePrimFlags(ushort type, bool inUse, byte[] data) public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
{ {
//m_log.Info("TSomething1:" + ((type & (ushort)ExtraParamType.Something1) == (ushort)ExtraParamType.Something1)); //m_log.Info("TSomething1:" + ((type & (ushort)ExtraParamType.Something1) == (ushort)ExtraParamType.Something1));
//m_log.Info("TSomething2:" + ((type & (ushort)ExtraParamType.Something2) == (ushort)ExtraParamType.Something2)); //m_log.Info("TSomething2:" + ((type & (ushort)ExtraParamType.Something2) == (ushort)ExtraParamType.Something2));
//m_log.Info("TSomething3:" + ((type & (ushort)ExtraParamType.Something3) == (ushort)ExtraParamType.Something3)); //m_log.Info("TSomething3:" + ((type & (ushort)ExtraParamType.Something3) == (ushort)ExtraParamType.Something3));
@ -1814,7 +1805,6 @@ namespace OpenSim.Region.Environment.Scenes
//bool IsLocked = false; //bool IsLocked = false;
int i = 0; int i = 0;
try try
{ {
i += 46; i += 46;
@ -1858,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
if (IsPhantom) if (IsPhantom)
{ {
AddFlag(LLObject.ObjectFlags.Phantom); AddFlag(LLObject.ObjectFlags.Phantom);
@ -1927,6 +1916,7 @@ namespace OpenSim.Region.Environment.Scenes
// System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); // System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
ScheduleFullUpdate(); ScheduleFullUpdate();
} }
public void ScriptSetPhysicsStatus(bool UsePhysics) public void ScriptSetPhysicsStatus(bool UsePhysics)
{ {
if (m_parentGroup != null) if (m_parentGroup != null)
@ -1934,6 +1924,7 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.ScriptSetPhysicsStatus(UsePhysics); m_parentGroup.ScriptSetPhysicsStatus(UsePhysics);
} }
} }
public void ScriptSetPhantomStatus(bool Phantom) public void ScriptSetPhantomStatus(bool Phantom)
{ {
if (m_parentGroup != null) if (m_parentGroup != null)
@ -1941,6 +1932,7 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.ScriptSetPhantomStatus(Phantom); m_parentGroup.ScriptSetPhantomStatus(Phantom);
} }
} }
public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew) public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
{ {
if (PhysActor != null) if (PhysActor != null)
@ -1965,7 +1957,6 @@ namespace OpenSim.Region.Environment.Scenes
/// that's not wholesome. Had to make Scene public /// that's not wholesome. Had to make Scene public
//PhysActor = null; //PhysActor = null;
if ((ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) if ((ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
{ {
//PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( //PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@ -1989,7 +1980,6 @@ namespace OpenSim.Region.Environment.Scenes
PhysActor.link(ParentGroup.RootPart.PhysActor); PhysActor.link(ParentGroup.RootPart.PhysActor);
} }
} }
} }
} }
} }
@ -2029,7 +2019,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
} }
#endregion #endregion
@ -2394,7 +2383,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public void AddFullUpdateToAvatar(ScenePresence presence) public void AddFullUpdateToAvatar(ScenePresence presence)
{ {
presence.QueuePartForUpdate(this); presence.QueuePartForUpdate(this);
@ -2454,13 +2442,11 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
remoteClient.SendPrimitiveToClient( remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, OwnerID,
lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment,
OwnerID, m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
} }
/// Terse updates /// Terse updates
@ -2557,7 +2543,6 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.AbsolutePosition = newpos; m_parentGroup.AbsolutePosition = newpos;
return; return;
} }
} }
ScheduleTerseUpdate(); ScheduleTerseUpdate();
@ -2578,7 +2563,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
} }
public void SetText(string text) public void SetText(string text)
{ {
Text = text; Text = text;
@ -2724,7 +2708,6 @@ namespace OpenSim.Region.Environment.Scenes
info.AddValue("PayPrice", PayPrice); info.AddValue("PayPrice", PayPrice);
} }
public void Undo() public void Undo()
{ {
if (m_undo.Count > 0) if (m_undo.Count > 0)
@ -2837,10 +2820,9 @@ namespace OpenSim.Region.Environment.Scenes
else else
ScheduleFullUpdate(); ScheduleFullUpdate();
} }
public void PhysicsCollision(EventArgs e) public void PhysicsCollision(EventArgs e)
{ {
//return;
// single threaded here // single threaded here
if (e == null) if (e == null)
{ {
@ -2865,7 +2847,6 @@ namespace OpenSim.Region.Environment.Scenes
startedColliders.Add(localid); startedColliders.Add(localid);
} }
//m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString()); //m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
} }
} }
@ -2879,7 +2860,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
//add the items that started colliding this time to the last colliders list. //add the items that started colliding this time to the last colliders list.
foreach (uint localID in startedColliders) foreach (uint localID in startedColliders)
{ {
@ -2944,7 +2924,6 @@ namespace OpenSim.Region.Environment.Scenes
colliding.Add(detobj); colliding.Add(detobj);
} }
} }
} }
} }
} }
@ -2958,7 +2937,6 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage); m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage);
} }
} }
} }
if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision) != 0) if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision) != 0)

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

@ -130,7 +130,7 @@ namespace OpenSim.Region.Physics.Manager
IPhysicsPlugin plug = IPhysicsPlugin plug =
(IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Init(); plug.Init();
if(!_PhysPlugins.ContainsKey(plug.GetName())) if (!_PhysPlugins.ContainsKey(plug.GetName()))
{ {
_PhysPlugins.Add(plug.GetName(), plug); _PhysPlugins.Add(plug.GetName(), plug);
m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName()); m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName());
@ -143,7 +143,7 @@ namespace OpenSim.Region.Physics.Manager
{ {
IMeshingPlugin plug = IMeshingPlugin plug =
(IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
if(!_MeshPlugins.ContainsKey(plug.GetName())) if (!_MeshPlugins.ContainsKey(plug.GetName()))
{ {
_MeshPlugins.Add(plug.GetName(), plug); _MeshPlugins.Add(plug.GetName(), plug);
m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName()); m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName());