diff options
author | John Hurliman | 2009-09-30 17:51:34 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 17:51:34 -0700 |
commit | cb26878f96adf99235709e1460474513d2e38f36 (patch) | |
tree | ba23794b2c24f7c27bd3d1ed878f84d43292d7ee /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-cb26878f96adf99235709e1460474513d2e38f36.zip opensim-SC_OLD-cb26878f96adf99235709e1460474513d2e38f36.tar.gz opensim-SC_OLD-cb26878f96adf99235709e1460474513d2e38f36.tar.bz2 opensim-SC_OLD-cb26878f96adf99235709e1460474513d2e38f36.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index bfce7b1..c7aeca14 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack | |||
80 | /// </summary> | 80 | /// </summary> |
81 | /// | 81 | /// |
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); |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack | |||
121 | /// <param name="meshEngine">The name of the mesh engine to use</param> | 121 | /// <param name="meshEngine">The name of the mesh engine to use</param> |
122 | /// <param name="config">The configuration data to pass to the physics and mesh engines</param> | 122 | /// <param name="config">The configuration data to pass to the physics and mesh engines</param> |
123 | /// <param name="osSceneIdentifier"> | 123 | /// <param name="osSceneIdentifier"> |
124 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 124 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
125 | /// </param> | 125 | /// </param> |
126 | /// <returns></returns> | 126 | /// <returns></returns> |
127 | protected PhysicsScene GetPhysicsScene( | 127 | protected PhysicsScene GetPhysicsScene( |