diff options
author | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
commit | b7d596a6af51bea7dba642cdc768ac5ff77af5f3 (patch) | |
tree | 967b749b10b548f6ed687d8ade4680e411793da4 /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |
parent | build ThrottleCheck function to clear up bits of the throttle (diff) | |
download | opensim-SC_OLD-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.zip opensim-SC_OLD-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.gz opensim-SC_OLD-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.bz2 opensim-SC_OLD-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.xz |
* Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up.
* Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index aa6f59a..2f7e591 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
41 | 41 | ||
42 | public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData); | 42 | public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData); |
43 | 43 | ||
44 | public delegate bool RegionUP (RegionInfo region); | 44 | public delegate bool RegionUp (SearializableRegionInfo region); |
45 | 45 | ||
46 | public sealed class InterRegionSingleton | 46 | public sealed class InterRegionSingleton |
47 | { | 47 | { |
@@ -76,11 +76,12 @@ namespace OpenSim.Region.Communications.OGS1 | |||
76 | return false; | 76 | return false; |
77 | } | 77 | } |
78 | 78 | ||
79 | public bool RegionUp(RegionInfo region) | 79 | public bool RegionUp(SearializableRegionInfo sregion) |
80 | { | 80 | { |
81 | |||
81 | if (OnRegionUp != null) | 82 | if (OnRegionUp != null) |
82 | { | 83 | { |
83 | return OnRegionUp(region); | 84 | return OnRegionUp(sregion); |
84 | } | 85 | } |
85 | return false; | 86 | return false; |
86 | } | 87 | } |
@@ -129,7 +130,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
129 | return false; | 130 | return false; |
130 | } | 131 | } |
131 | } | 132 | } |
132 | public bool RegionUp(RegionInfo region) | 133 | public bool RegionUp(SearializableRegionInfo region) |
133 | { | 134 | { |
134 | try | 135 | try |
135 | { | 136 | { |
@@ -141,6 +142,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
141 | return false; | 142 | return false; |
142 | } | 143 | } |
143 | } | 144 | } |
145 | |||
144 | public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) | 146 | public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) |
145 | { | 147 | { |
146 | try | 148 | try |