aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-29 02:07:19 +0000
committerTeravus Ovares2007-11-29 02:07:19 +0000
commit81ba94fde8871df86e304a3dad7846059fd32045 (patch)
treee69bf4f58fe2a18576eac64f677de196d0f31278 /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
parentset svn:eol-style (diff)
downloadopensim-SC_OLD-81ba94fde8871df86e304a3dad7846059fd32045.zip
opensim-SC_OLD-81ba94fde8871df86e304a3dad7846059fd32045.tar.gz
opensim-SC_OLD-81ba94fde8871df86e304a3dad7846059fd32045.tar.bz2
opensim-SC_OLD-81ba94fde8871df86e304a3dad7846059fd32045.tar.xz
* Fixed about 7 issues with restarting sims and resolved interRegion comms issues. This includes the issue that MW described this morning.
There's a lot of little nit picky changes that make a world of difference.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 2f7e591..d55528c 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 (SearializableRegionInfo region); 44 public delegate bool RegionUp (SearializableRegionInfo region, ulong regionhandle);
45 45
46 public sealed class InterRegionSingleton 46 public sealed class InterRegionSingleton
47 { 47 {
@@ -76,12 +76,12 @@ namespace OpenSim.Region.Communications.OGS1
76 return false; 76 return false;
77 } 77 }
78 78
79 public bool RegionUp(SearializableRegionInfo sregion) 79 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
80 { 80 {
81 81
82 if (OnRegionUp != null) 82 if (OnRegionUp != null)
83 { 83 {
84 return OnRegionUp(sregion); 84 return OnRegionUp(sregion, regionhandle);
85 } 85 }
86 return false; 86 return false;
87 } 87 }
@@ -130,11 +130,11 @@ namespace OpenSim.Region.Communications.OGS1
130 return false; 130 return false;
131 } 131 }
132 } 132 }
133 public bool RegionUp(SearializableRegionInfo region) 133 public bool RegionUp(SearializableRegionInfo region, ulong regionhandle)
134 { 134 {
135 try 135 try
136 { 136 {
137 return InterRegionSingleton.Instance.RegionUp(region); 137 return InterRegionSingleton.Instance.RegionUp(region, regionhandle);
138 } 138 }
139 catch (RemotingException e) 139 catch (RemotingException e)
140 { 140 {