diff options
| author | Melanie | 2011-11-24 01:16:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-24 01:16:37 +0000 |
| commit | a8270cb48cf8dbca7595da5963d8fafdb1141529 (patch) | |
| tree | cf878acca0c652239f4441c3783647b6b0b688a6 /OpenSim/Region/OptionalModules/PhysicsParameters | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Append asset ID to URL for storage requests to allow caching proxies to work ... (diff) | |
| download | opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.zip opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.gz opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.bz2 opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules/PhysicsParameters')
| -rwxr-xr-x | OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs index 2a44360..23ef757 100755 --- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs +++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs | |||
| @@ -48,7 +48,7 @@ namespace OpenSim.Region.OptionalModules.PhysicsParameters | |||
| 48 | public class PhysicsParameters : ISharedRegionModule | 48 | public class PhysicsParameters : ISharedRegionModule |
| 49 | { | 49 | { |
| 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 51 | private static string LogHeader = "[PHYSICS PARAMETERS]"; | 51 | // private static string LogHeader = "[PHYSICS PARAMETERS]"; |
| 52 | 52 | ||
| 53 | private List<Scene> m_scenes = new List<Scene>(); | 53 | private List<Scene> m_scenes = new List<Scene>(); |
| 54 | private static bool m_commandsLoaded = false; | 54 | private static bool m_commandsLoaded = false; |