diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/IScene.cs | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
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 | ||