diff options
author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 2af98cc..0ac4ed4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
92 | /// <value> | 92 | /// <value> |
93 | /// Registered classes that are capable of creating entities. | 93 | /// Registered classes that are capable of creating entities. |
94 | /// </value> | 94 | /// </value> |
95 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); | 95 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); |
96 | 96 | ||
97 | /// <summary> | 97 | /// <summary> |
98 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is | 98 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is |
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
279 | _primAllocateMutex.ReleaseMutex(); | 279 | _primAllocateMutex.ReleaseMutex(); |
280 | 280 | ||
281 | return myID; | 281 | return myID; |
282 | } | 282 | } |
283 | 283 | ||
284 | #region Module Methods | 284 | #region Module Methods |
285 | 285 | ||
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
473 | /// <summary> | 473 | /// <summary> |
474 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. | 474 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. |
475 | /// </summary> | 475 | /// </summary> |
476 | /// <param name="showParams">What to show</param> | 476 | /// <param name="showParams">What to show</param> |
477 | public virtual void Show(string[] showParams) | 477 | public virtual void Show(string[] showParams) |
478 | { | 478 | { |
479 | switch (showParams[0]) | 479 | switch (showParams[0]) |
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
489 | } | 489 | } |
490 | break; | 490 | break; |
491 | } | 491 | } |
492 | } | 492 | } |
493 | 493 | ||
494 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) | 494 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) |
495 | { | 495 | { |