diff options
| author | Melanie | 2011-10-11 23:21:36 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:21:36 +0100 |
| commit | 1b3ea64fe9dbc499696feed70237dffc215ce01b (patch) | |
| tree | 71f1dff109f07dcace1e43c55ff7ae7ba0ced80d /OpenSim/Framework | |
| parent | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge (diff) | |
| parent | Remove vestigal RegionStatus.SlaveScene. (diff) | |
| download | opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.zip opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.gz opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.bz2 opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.xz | |
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 8f7a2e5..e0cb897 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -33,15 +33,12 @@ namespace OpenSim.Framework | |||
| 33 | { | 33 | { |
| 34 | public delegate void restart(RegionInfo thisRegion); | 34 | public delegate void restart(RegionInfo thisRegion); |
| 35 | 35 | ||
| 36 | //public delegate void regionup (RegionInfo thisRegion); | ||
| 37 | |||
| 38 | public enum RegionStatus : int | 36 | public enum RegionStatus : int |
| 39 | { | 37 | { |
| 40 | Down = 0, | 38 | Down = 0, |
| 41 | Up = 1, | 39 | Up = 1, |
| 42 | Crashed = 2, | 40 | Crashed = 2, |
| 43 | Starting = 3, | 41 | Starting = 3, |
| 44 | SlaveScene = 4 | ||
| 45 | }; | 42 | }; |
| 46 | 43 | ||
| 47 | /// <value> | 44 | /// <value> |