diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index a266a40..bfce7b1 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack | |||
61 | get { return m_commsManager; } | 61 | get { return m_commsManager; } |
62 | set { m_commsManager = value; } | 62 | set { m_commsManager = value; } |
63 | } | 63 | } |
64 | protected CommunicationsManager m_commsManager; | 64 | protected CommunicationsManager m_commsManager; |
65 | 65 | ||
66 | protected StorageManager m_storageManager; | 66 | protected StorageManager m_storageManager; |
67 | 67 | ||
@@ -82,13 +82,13 @@ namespace OpenSim.Region.ClientStack | |||
82 | /// <param name="osSceneIdentifier"> | 82 | /// <param name="osSceneIdentifier"> |
83 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 83 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
84 | /// </param> | 84 | /// </param> |
85 | /// <returns></returns> | 85 | /// <returns></returns> |
86 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); | 86 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); |
87 | 87 | ||
88 | protected abstract StorageManager CreateStorageManager(); | 88 | protected abstract StorageManager CreateStorageManager(); |
89 | protected abstract ClientStackManager CreateClientStackManager(); | 89 | protected abstract ClientStackManager CreateClientStackManager(); |
90 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 90 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
91 | AgentCircuitManager circuitManager); | 91 | AgentCircuitManager circuitManager); |
92 | 92 | ||
93 | protected override void StartupSpecific() | 93 | protected override void StartupSpecific() |
94 | { | 94 | { |