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/Framework/IScene.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IScene.cs')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 2e2c703..489653f 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Framework | |||
| 55 | GodTakeCopy = 5, | 55 | GodTakeCopy = 5, |
| 56 | Delete = 6, | 56 | Delete = 6, |
| 57 | Return = 9 | 57 | Return = 9 |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | public interface IScene | 60 | public interface IScene |
| 61 | { | 61 | { |
| @@ -74,7 +74,7 @@ namespace OpenSim.Framework | |||
| 74 | void CloseAllAgents(uint circuitcode); | 74 | void CloseAllAgents(uint circuitcode); |
| 75 | 75 | ||
| 76 | void Restart(int seconds); | 76 | void Restart(int seconds); |
| 77 | bool OtherRegionUp(RegionInfo thisRegion); | 77 | //RegionInfo OtherRegionUp(RegionInfo thisRegion); |
| 78 | 78 | ||
| 79 | string GetSimulatorVersion(); | 79 | string GetSimulatorVersion(); |
| 80 | 80 | ||