aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2012-07-20 15:34:19 -0700
committerRobert Adams2012-07-20 15:34:19 -0700
commitb25d874afaa5a3111455b9e49a73343b3afd6f14 (patch)
treed5d4afde4ba379d7f8075d7573a0ec535b031e3d /OpenSim/Region
parentBulletSim: more detail logging for vehicle and general physics debugging. (diff)
downloadopensim-SC_OLD-b25d874afaa5a3111455b9e49a73343b3afd6f14.zip
opensim-SC_OLD-b25d874afaa5a3111455b9e49a73343b3afd6f14.tar.gz
opensim-SC_OLD-b25d874afaa5a3111455b9e49a73343b3afd6f14.tar.bz2
opensim-SC_OLD-b25d874afaa5a3111455b9e49a73343b3afd6f14.tar.xz
BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
index 9b1b1a3..fb74cc6 100644
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.CoreModules.Statistics.Logging 42namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
43{ 43{
44 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")] 44 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")]
45 public class BinaryLoggingModule : INonSharedRegionModule 45 public class BinaryLoggingModule : INonSharedRegionModule
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9d41ce8..8773485 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -31,8 +31,9 @@ using System.Text;
31using System.Threading; 31using System.Threading;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework; 33using OpenSim.Region.Framework;
34using OpenSim.Region.Physics.Manager; 34using OpenSim.Region.CoreModules;
35using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; 35using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
36using OpenSim.Region.Physics.Manager;
36using Nini.Config; 37using Nini.Config;
37using log4net; 38using log4net;
38using OpenMetaverse; 39using OpenMetaverse;