mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
@@ -33,15 +33,12 @@ namespace OpenSim.Framework
|
||||
{
|
||||
public delegate void restart(RegionInfo thisRegion);
|
||||
|
||||
//public delegate void regionup (RegionInfo thisRegion);
|
||||
|
||||
public enum RegionStatus : int
|
||||
{
|
||||
Down = 0,
|
||||
Up = 1,
|
||||
Crashed = 2,
|
||||
Starting = 3,
|
||||
SlaveScene = 4
|
||||
};
|
||||
|
||||
/// <value>
|
||||
|
||||
Reference in New Issue
Block a user