aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2012-02-17 21:15:18 -0500
committerBlueWall2012-02-17 21:15:18 -0500
commitfbccff49940725f325dd864c2c5c39ad4bdb63e1 (patch)
treed9f4457a8441ae381dd567a37d1ba9c02e16f809 /OpenSim/Region
parentParcel sales support to SQLite (diff)
parentFix a bug where changing shape parameters of a child prim in a linkset would ... (diff)
downloadopensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.zip
opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.gz
opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.bz2
opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs3
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs24
3 files changed, 26 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index e66678a..66fb493 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1592,7 +1592,7 @@ namespace OpenSim.Region.Framework.Scenes
1592 1592
1593 if (group != null) 1593 if (group != null)
1594 { 1594 {
1595 if (m_parentScene.Permissions.CanEditObject(group.UUID,agentID)) 1595 if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID))
1596 { 1596 {
1597 group.UpdateExtraParam(primLocalID, type, inUse, data); 1597 group.UpdateExtraParam(primLocalID, type, inUse, data);
1598 } 1598 }
@@ -1609,7 +1609,7 @@ namespace OpenSim.Region.Framework.Scenes
1609 SceneObjectGroup group = GetGroupByPrim(primLocalID); 1609 SceneObjectGroup group = GetGroupByPrim(primLocalID);
1610 if (group != null) 1610 if (group != null)
1611 { 1611 {
1612 if (m_parentScene.Permissions.CanEditObject(group.GetPartsFullID(primLocalID), agentID)) 1612 if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID))
1613 { 1613 {
1614 ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock(); 1614 ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock();
1615 shapeData.ObjectLocalID = shapeBlock.ObjectLocalID; 1615 shapeData.ObjectLocalID = shapeBlock.ObjectLocalID;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 3763696..8587a2b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -30,7 +30,8 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using Nini.Config; 32using Nini.Config;
33using log4net; 33using log4net;
34using OpenSim.Framework;
34 35
35namespace OpenSim.Region.Physics.Manager 36namespace OpenSim.Region.Physics.Manager
36{ 37{
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 716161a..6ee2714 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Physics.OdePlugin
46 /// </summary> 46 /// </summary>
47 public class OdePlugin : IPhysicsPlugin 47 public class OdePlugin : IPhysicsPlugin
48 { 48 {
49 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 private OdeScene m_scene; 51 private OdeScene m_scene;
52 52
@@ -59,13 +59,33 @@ namespace OpenSim.Region.Physics.OdePlugin
59 { 59 {
60 if (m_scene == null) 60 if (m_scene == null)
61 { 61 {
62 // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
63 // it's running as a 32-bit process or a 64-bit one. By invoking LoadLibary here, later DLLImports
64 // will find it already loaded later on.
65 //
66 // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
67 // controlled in Ode.NET.dll.config
68 if (Util.IsWindows())
69 {
70 string nativeLibraryPath;
71
72 if (Util.Is64BitProcess())
73 nativeLibraryPath = "lib64/ode.dll";
74 else
75 nativeLibraryPath = "lib32/ode.dll";
76
77 m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
78 Util.LoadLibrary(nativeLibraryPath);
79 }
80
62 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to 81 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
63 // http://opensimulator.org/mantis/view.php?id=2750). 82 // http://opensimulator.org/mantis/view.php?id=2750).
64 d.InitODE(); 83 d.InitODE();
65 84
66 m_scene = new OdeScene(sceneIdentifier); 85 m_scene = new OdeScene(sceneIdentifier);
67 } 86 }
68 return (m_scene); 87
88 return m_scene;
69 } 89 }
70 90
71 public string GetName() 91 public string GetName()