aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff options
context:
space:
mode:
authorlbsa712007-12-27 21:41:48 +0000
committerlbsa712007-12-27 21:41:48 +0000
commitefd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch)
treebf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
parent* removed always true if (diff)
downloadopensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip
opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz
opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2
opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz
* Optimized usings
* shortened references * Removed redundant 'this' * Normalized EOF
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs32
1 files changed, 20 insertions, 12 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 683c471..a0da07e 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, ulong regionhandle); 44 public delegate bool RegionUp(SearializableRegionInfo region, ulong regionhandle);
45 45
46 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); 46 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
47 47
@@ -81,7 +81,6 @@ namespace OpenSim.Region.Communications.OGS1
81 81
82 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) 82 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
83 { 83 {
84
85 if (OnRegionUp != null) 84 if (OnRegionUp != null)
86 { 85 {
87 return OnRegionUp(sregion, regionhandle); 86 return OnRegionUp(sregion, regionhandle);
@@ -106,6 +105,7 @@ namespace OpenSim.Region.Communications.OGS1
106 } 105 }
107 return false; 106 return false;
108 } 107 }
108
109 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 109 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
110 { 110 {
111 if (OnPrimGroupNear != null) 111 if (OnPrimGroupNear != null)
@@ -114,6 +114,7 @@ namespace OpenSim.Region.Communications.OGS1
114 } 114 }
115 return false; 115 return false;
116 } 116 }
117
117 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 118 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
118 { 119 {
119 if (OnPrimGroupArrival != null) 120 if (OnPrimGroupArrival != null)
@@ -134,7 +135,8 @@ namespace OpenSim.Region.Communications.OGS1
134 { 135 {
135 try 136 try
136 { 137 {
137 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, new AgentCircuitData(agentData)); 138 return
139 InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, new AgentCircuitData(agentData));
138 } 140 }
139 catch (RemotingException e) 141 catch (RemotingException e)
140 { 142 {
@@ -142,7 +144,8 @@ namespace OpenSim.Region.Communications.OGS1
142 return false; 144 return false;
143 } 145 }
144 } 146 }
145 public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) 147
148 public bool RegionUp(SearializableRegionInfo region, ulong regionhandle)
146 { 149 {
147 try 150 try
148 { 151 {
@@ -155,25 +158,27 @@ namespace OpenSim.Region.Communications.OGS1
155 } 158 }
156 } 159 }
157 160
158 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) 161 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData)
159 { 162 {
160 try 163 try
161 { 164 {
162 return InterRegionSingleton.Instance.ChildAgentUpdate(regionHandle,cAgentData); 165 return InterRegionSingleton.Instance.ChildAgentUpdate(regionHandle, cAgentData);
163 } 166 }
164 catch (RemotingException e) 167 catch (RemotingException e)
165 { 168 {
166 Console.WriteLine("Remoting Error: Unable to send Child agent update to remote region.\n" + e.ToString()); 169 Console.WriteLine("Remoting Error: Unable to send Child agent update to remote region.\n" + e.ToString());
167 return false; 170 return false;
168 } 171 }
169
170 } 172 }
171 173
172 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying) 174 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
173 { 175 {
174 try 176 try
175 { 177 {
176 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), new LLVector3(position.x,position.y,position.z), isFlying); 178 return
179 InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID),
180 new LLVector3(position.x, position.y, position.z),
181 isFlying);
177 } 182 }
178 catch (RemotingException e) 183 catch (RemotingException e)
179 { 184 {
@@ -181,20 +186,24 @@ namespace OpenSim.Region.Communications.OGS1
181 return false; 186 return false;
182 } 187 }
183 } 188 }
189
184 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical) 190 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
185 { 191 {
186 try 192 try
187 { 193 {
188 return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), new LLVector3(position.x,position.y,position.z), isPhysical); 194 return
195 InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID),
196 new LLVector3(position.x, position.y, position.z),
197 isPhysical);
189 } 198 }
190 catch (RemotingException e) 199 catch (RemotingException e)
191 { 200 {
192 Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 201 Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
193 return false; 202 return false;
194 } 203 }
195
196 } 204 }
197 public bool InformRegionOfPrimCrossing(ulong regionHandle,Guid primID, string objData) 205
206 public bool InformRegionOfPrimCrossing(ulong regionHandle, Guid primID, string objData)
198 { 207 {
199 try 208 try
200 { 209 {
@@ -206,6 +215,5 @@ namespace OpenSim.Region.Communications.OGS1
206 return false; 215 return false;
207 } 216 }
208 } 217 }
209
210 } 218 }
211} \ No newline at end of file 219} \ No newline at end of file