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

Update svn properties, minor formatting cleanup.

0.6.2-post-fixes
Jeff Ames 2008-12-30 01:08:07 +00:00
parent 3a6b27befb
commit 2be0f7a6f0
22 changed files with 1950 additions and 1809 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Framework/OpenJpeg/bio.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
@ -6,7 +33,6 @@ namespace OpenSim.Framework.OpenJpeg
{
public static class bio
{
public static opj_bio bio_create()
{
opj_bio bio = new opj_bio();
@ -113,7 +139,6 @@ namespace OpenSim.Framework.OpenJpeg
bio.ct--;
bio.buf |= (byte)(b << bio.ct);
}
private static int bio_getbit(opj_bio bio)
@ -124,7 +149,6 @@ namespace OpenSim.Framework.OpenJpeg
return (int)((bio.buf >> bio.ct) & 1);
}
}
public struct opj_bio

29
OpenSim/Framework/OpenJpeg/fix.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;

30
OpenSim/Framework/OpenJpeg/int_.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
@ -53,6 +80,5 @@ namespace OpenSim.Framework.OpenJpeg
return 1;
}
}
}

76
OpenSim/Framework/OpenJpeg/j2k.cs
View File

@ -1,10 +1,36 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework.OpenJpeg
{
public static class j2k
{
}
@ -23,8 +49,8 @@ namespace OpenSim.Framework.OpenJpeg
public enum J2K_T2_MODE
{
THRESH_CALC = 0, /** Function called in Rate allocation process*/
FINAL_PASS = 1 /** Function called in Tier 2 process*/
THRESH_CALC = 0, /** Function called in Rate allocation process*/
FINAL_PASS = 1 /** Function called in Tier 2 process*/
}
public struct opj_stepsize
@ -52,7 +78,6 @@ namespace OpenSim.Framework.OpenJpeg
/// Don't forget to initialize 33 elements
/// </summary>
public int[] prcw;
}
public struct opj_tcp
@ -82,7 +107,6 @@ namespace OpenSim.Framework.OpenJpeg
/// </summary>
public float[] distoratio;
public opj_tccp tccps;
}
public struct opj_cp
@ -134,25 +158,25 @@ namespace OpenSim.Framework.OpenJpeg
public const uint J2K_CCP_QNTSTY_SIQNT = 1;
public const uint J2K_CCP_QNTSTY_SEQNT = 2;
public const uint J2K_MS_SOC = 0xff4f; /**< SOC marker value */
public const uint J2K_MS_SOT = 0xff90; /**< SOT marker value */
public const uint J2K_MS_SOD = 0xff93; /**< SOD marker value */
public const uint J2K_MS_EOC = 0xffd9; /**< EOC marker value */
public const uint J2K_MS_SIZ = 0xff51; /**< SIZ marker value */
public const uint J2K_MS_COD = 0xff52; /**< COD marker value */
public const uint J2K_MS_COC = 0xff53; /**< COC marker value */
public const uint J2K_MS_RGN = 0xff5e; /**< RGN marker value */
public const uint J2K_MS_QCD = 0xff5c; /**< QCD marker value */
public const uint J2K_MS_QCC = 0xff5d; /**< QCC marker value */
public const uint J2K_MS_POC = 0xff5f; /**< POC marker value */
public const uint J2K_MS_TLM = 0xff55; /**< TLM marker value */
public const uint J2K_MS_PLM = 0xff57; /**< PLM marker value */
public const uint J2K_MS_PLT = 0xff58; /**< PLT marker value */
public const uint J2K_MS_PPM = 0xff60; /**< PPM marker value */
public const uint J2K_MS_PPT = 0xff61; /**< PPT marker value */
public const uint J2K_MS_SOP = 0xff91; /**< SOP marker value */
public const uint J2K_MS_EPH = 0xff92; /**< EPH marker value */
public const uint J2K_MS_CRG = 0xff63; /**< CRG marker value */
public const uint J2K_MS_COM = 0xff64; /**< COM marker value */
public const uint J2K_MS_SOC = 0xff4f; /**< SOC marker value */
public const uint J2K_MS_SOT = 0xff90; /**< SOT marker value */
public const uint J2K_MS_SOD = 0xff93; /**< SOD marker value */
public const uint J2K_MS_EOC = 0xffd9; /**< EOC marker value */
public const uint J2K_MS_SIZ = 0xff51; /**< SIZ marker value */
public const uint J2K_MS_COD = 0xff52; /**< COD marker value */
public const uint J2K_MS_COC = 0xff53; /**< COC marker value */
public const uint J2K_MS_RGN = 0xff5e; /**< RGN marker value */
public const uint J2K_MS_QCD = 0xff5c; /**< QCD marker value */
public const uint J2K_MS_QCC = 0xff5d; /**< QCC marker value */
public const uint J2K_MS_POC = 0xff5f; /**< POC marker value */
public const uint J2K_MS_TLM = 0xff55; /**< TLM marker value */
public const uint J2K_MS_PLM = 0xff57; /**< PLM marker value */
public const uint J2K_MS_PLT = 0xff58; /**< PLT marker value */
public const uint J2K_MS_PPM = 0xff60; /**< PPM marker value */
public const uint J2K_MS_PPT = 0xff61; /**< PPT marker value */
public const uint J2K_MS_SOP = 0xff91; /**< SOP marker value */
public const uint J2K_MS_EPH = 0xff92; /**< EPH marker value */
public const uint J2K_MS_CRG = 0xff63; /**< CRG marker value */
public const uint J2K_MS_COM = 0xff64; /**< COM marker value */
}
}

41
OpenSim/Framework/OpenJpeg/openjpeg.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
@ -8,8 +35,6 @@ namespace OpenSim.Framework.OpenJpeg
{
public openjpeg()
{
}
}
@ -186,7 +211,6 @@ namespace OpenSim.Framework.OpenJpeg
public int jpwl_exp_comps;
public int jpwl_max_tiles;
public LIMIT_DECODING cp_limit_decoding;
}
public struct opj_common_fields
@ -204,6 +228,7 @@ namespace OpenSim.Framework.OpenJpeg
{
public opj_common_fields flds;
}
public struct opj_dinfo
{
public opj_common_fields flds;
@ -340,19 +365,11 @@ namespace OpenSim.Framework.OpenJpeg
public int main_head_end;
public int codestream_size;
public opj_tile_info tile;
}
public static class opj_defines
{
public const int OPJ_STREAM_READ = 0x0001;
public const int OPJ_STREAM_WRITE = 0x0002;
}
}

33
OpenSim/Framework/OpenJpeg/pi.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
@ -41,8 +68,4 @@ namespace OpenSim.Framework.OpenJpeg
public int tx0, ty0, tx1, ty1;
public int x, y, dx, dy;
}
}

4
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -8248,7 +8248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ap.Data = new AvatarPicksReplyPacket.DataBlock[picks.Count];
int i = 0;
foreach(KeyValuePair<UUID, string> pick in picks)
foreach (KeyValuePair<UUID, string> pick in picks)
{
ap.Data[i] = new AvatarPicksReplyPacket.DataBlock();
ap.Data[i].PickID = pick.Key;
@ -8272,7 +8272,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ac.Data = new AvatarClassifiedReplyPacket.DataBlock[classifieds.Count];
int i = 0;
foreach(KeyValuePair<UUID, string> classified in classifieds)
foreach (KeyValuePair<UUID, string> classified in classifieds)
{
ac.Data[i] = new AvatarClassifiedReplyPacket.DataBlock();
ac.Data[i].ClassifiedID = classified.Key;

2
OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender
int hex = 0;
Color newColour;
if(Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
if (Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
{
newColour = Color.FromArgb(hex);
}

2
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -533,7 +533,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
{
permission = true;
}
else if(group.IsAttachment)
else if (group.IsAttachment)
{
permission = false;
}

8
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -4456,14 +4456,14 @@ namespace OpenSim.Region.Environment.Scenes
// update non-physical objects like the joint proxy objects that represent the position
// of the joints in the scene.
// This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene
// This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene
// WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called
// from within the OdePhysicsScene.
protected internal void jointMoved(PhysicsJoint joint)
{
// m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock(OdeLock) when this callback is invoked
// m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked
// FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
if (jointProxyObject == null)
@ -4521,7 +4521,7 @@ namespace OpenSim.Region.Environment.Scenes
// update non-physical objects like the joint proxy objects that represent the position
// of the joints in the scene.
// This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene
// This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene
// WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called
// from within the OdePhysicsScene.
protected internal void jointDeactivated(PhysicsJoint joint)
@ -4547,7 +4547,7 @@ namespace OpenSim.Region.Environment.Scenes
// alert the user of errors by using the debug channel in the same way that scripts alert
// the user of compile errors.
// This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene
// This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene
// WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called
// from within the OdePhysicsScene.
public void jointErrorMessage(PhysicsJoint joint, string message)

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

@ -1624,7 +1624,7 @@ if (m_shape != null) {
part.m_fromUserInventoryItemID = fromUserInventoryItemId;
// for tempOnRez objects, we have to fix the Expire date.
if((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire();
if ((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire();
return part;
}

16
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1366,28 +1366,28 @@ namespace OpenSim.Region.Physics.OdePlugin
get { return m_NINJA_physics_joints_enabled; }
}
// internal utility function: must be called within a lock(OdeLock)
// internal utility function: must be called within a lock (OdeLock)
private void InternalAddActiveJoint(PhysicsJoint joint)
{
activeJoints.Add(joint);
SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint);
}
// internal utility function: must be called within a lock(OdeLock)
// internal utility function: must be called within a lock (OdeLock)
private void InternalAddPendingJoint(OdePhysicsJoint joint)
{
pendingJoints.Add(joint);
SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint);
}
// internal utility function: must be called within a lock(OdeLock)
// internal utility function: must be called within a lock (OdeLock)
private void InternalRemovePendingJoint(PhysicsJoint joint)
{
pendingJoints.Remove(joint);
SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene);
}
// internal utility function: must be called within a lock(OdeLock)
// internal utility function: must be called within a lock (OdeLock)
private void InternalRemoveActiveJoint(PhysicsJoint joint)
{
activeJoints.Remove(joint);
@ -1640,7 +1640,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
// normally called from within OnJointMoved, which is called from within a lock(OdeLock)
// normally called from within OnJointMoved, which is called from within a lock (OdeLock)
public override PhysicsVector GetJointAnchor(PhysicsJoint joint)
{
Debug.Assert(joint.IsInPhysicsEngine);
@ -1666,7 +1666,7 @@ namespace OpenSim.Region.Physics.OdePlugin
return new PhysicsVector(pos.X, pos.Y, pos.Z);
}
// normally called from within OnJointMoved, which is called from within a lock(OdeLock)
// normally called from within OnJointMoved, which is called from within a lock (OdeLock)
// WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function
// appears to be unreliable. Fortunately we can compute the joint axis ourselves by
// keeping track of the joint's original orientation relative to one of the involved bodies.
@ -2230,8 +2230,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (SupportsNINJAJoints)
{
DeleteRequestedJoints(); // this must be outside of the lock(OdeLock) to avoid deadlocks
CreateRequestedJoints(); // this must be outside of the lock(OdeLock) to avoid deadlocks
DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
}
lock (OdeLock)

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3644,7 +3644,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
partItemID = item.ItemID;
int linkNumber = m_host.LinkNum;
if(m_host.ParentGroup.Children.Count == 1)
if (m_host.ParentGroup.Children.Count == 1)
linkNumber = 0;