aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs24
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs78
2 files changed, 51 insertions, 51 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 0eb144c..8f41d62 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities
475 public class AssetUploader 475 public class AssetUploader
476 { 476 {
477 public event UpLoadedAsset OnUpLoad; 477 public event UpLoadedAsset OnUpLoad;
478 private UpLoadedAsset handler001 = null; 478 private UpLoadedAsset handlerUpLoad = null;
479 479
480 private string uploaderPath = String.Empty; 480 private string uploaderPath = String.Empty;
481 private LLUUID newAssetID; 481 private LLUUID newAssetID;
@@ -529,10 +529,10 @@ namespace OpenSim.Region.Capabilities
529 { 529 {
530 SaveAssetToFile(m_assetName + ".jp2", data); 530 SaveAssetToFile(m_assetName + ".jp2", data);
531 } 531 }
532 handler001 = OnUpLoad; 532 handlerUpLoad = OnUpLoad;
533 if (handler001 != null) 533 if (handlerUpLoad != null)
534 { 534 {
535 handler001(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); 535 handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
536 } 536 }
537 537
538 return res; 538 return res;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.Capabilities
569 { 569 {
570 public event UpdateItem OnUpLoad; 570 public event UpdateItem OnUpLoad;
571 571
572 private UpdateItem handler001 = null; 572 private UpdateItem handlerUpdateItem = null;
573 573
574 private string uploaderPath = String.Empty; 574 private string uploaderPath = String.Empty;
575 private LLUUID inventoryItemID; 575 private LLUUID inventoryItemID;
@@ -598,10 +598,10 @@ namespace OpenSim.Region.Capabilities
598 string res = String.Empty; 598 string res = String.Empty;
599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
600 LLUUID assetID = LLUUID.Zero; 600 LLUUID assetID = LLUUID.Zero;
601 handler001 = OnUpLoad; 601 handlerUpdateItem = OnUpLoad;
602 if (handler001 != null) 602 if (handlerUpdateItem != null)
603 { 603 {
604 assetID = handler001(inv, data); 604 assetID = handlerUpdateItem(inv, data);
605 } 605 }
606 606
607 uploadComplete.new_asset = assetID.ToString(); 607 uploadComplete.new_asset = assetID.ToString();
@@ -651,7 +651,7 @@ namespace OpenSim.Region.Capabilities
651 { 651 {
652 public event UpdateTaskScript OnUpLoad; 652 public event UpdateTaskScript OnUpLoad;
653 653
654 private UpdateTaskScript handler001 = null; 654 private UpdateTaskScript handlerUpdateTaskScript = null;
655 655
656 private string uploaderPath = String.Empty; 656 private string uploaderPath = String.Empty;
657 private LLUUID inventoryItemID; 657 private LLUUID inventoryItemID;
@@ -693,10 +693,10 @@ namespace OpenSim.Region.Capabilities
693 string res = String.Empty; 693 string res = String.Empty;
694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
695 695
696 handler001 = OnUpLoad; 696 handlerUpdateTaskScript = OnUpLoad;
697 if (handler001 != null) 697 if (handlerUpdateTaskScript != null)
698 { 698 {
699 handler001(inventoryItemID, primID, isScriptRunning, data); 699 handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);
700 } 700 }
701 701
702 uploadComplete.item_id = inventoryItemID; 702 uploadComplete.item_id = inventoryItemID;
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 4d9411d..22750b9 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -46,15 +46,15 @@ namespace OpenSim.Framework
46 public event RegionUp OnRegionUp; 46 public event RegionUp OnRegionUp;
47 public event ChildAgentUpdate OnChildAgentUpdate; 47 public event ChildAgentUpdate OnChildAgentUpdate;
48 48
49 private ExpectUserDelegate handler001 = null; // OnExpectUser 49 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
50 private ExpectPrimDelegate handler002 = null; // OnExpectPrim; 50 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
51 private GenericCall2 handler003 = null; // OnExpectChildAgent; 51 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
52 private AgentCrossing handler004 = null; // OnAvatarCrossingIntoRegion; 52 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
53 private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion; 53 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
54 private UpdateNeighbours handler006 = null; // OnNeighboursUpdate; 54 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
55 private AcknowledgeAgentCross handler007 = null; // OnAcknowledgeAgentCrossed; 55 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
56 private AcknowledgePrimCross handler008 = null; // OnAcknowledgePrimCrossed; 56 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
57 private CloseAgentConnection handler009 = null; // OnCloseAgentConnection; 57 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
58 private RegionUp handlerRegionUp = null; // OnRegionUp; 58 private RegionUp handlerRegionUp = null; // OnRegionUp;
59 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; 59 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
60 60
@@ -68,10 +68,10 @@ namespace OpenSim.Framework
68 /// <returns></returns> 68 /// <returns></returns>
69 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 69 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
70 { 70 {
71 handler001 = OnExpectUser; 71 handlerExpectUser = OnExpectUser;
72 if (handler001 != null) 72 if (handlerExpectUser != null)
73 { 73 {
74 handler001(regionHandle, agent); 74 handlerExpectUser(regionHandle, agent);
75 return true; 75 return true;
76 } 76 }
77 77
@@ -81,10 +81,10 @@ namespace OpenSim.Framework
81 81
82 public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) 82 public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
83 { 83 {
84 handler002 = OnExpectPrim; 84 handlerExpectPrim = OnExpectPrim;
85 if (handler002 != null) 85 if (handlerExpectPrim != null)
86 { 86 {
87 handler002(regionHandle, primID, objData); 87 handlerExpectPrim(regionHandle, primID, objData);
88 return true; 88 return true;
89 } 89 }
90 return false; 90 return false;
@@ -115,10 +115,10 @@ namespace OpenSim.Framework
115 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, 115 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
116 bool isFlying) 116 bool isFlying)
117 { 117 {
118 handler004 = OnAvatarCrossingIntoRegion; 118 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
119 if (handler004 != null) 119 if (handlerAvatarCrossingIntoRegion != null)
120 { 120 {
121 handler004(regionHandle, agentID, position, isFlying); 121 handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
122 return true; 122 return true;
123 } 123 }
124 return false; 124 return false;
@@ -127,10 +127,10 @@ namespace OpenSim.Framework
127 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, 127 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position,
128 bool isPhysical) 128 bool isPhysical)
129 { 129 {
130 handler005 = OnPrimCrossingIntoRegion; 130 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
131 if (handler005 != null) 131 if (handlerPrimCrossingIntoRegion != null)
132 { 132 {
133 handler005(regionHandle, primID, position, isPhysical); 133 handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical);
134 return true; 134 return true;
135 } 135 }
136 return false; 136 return false;
@@ -138,10 +138,10 @@ namespace OpenSim.Framework
138 138
139 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) 139 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID)
140 { 140 {
141 handler007 = OnAcknowledgeAgentCrossed; 141 handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed;
142 if (handler007 != null) 142 if (handlerAcknowledgeAgentCrossed != null)
143 { 143 {
144 handler007(regionHandle, agentID); 144 handlerAcknowledgeAgentCrossed(regionHandle, agentID);
145 return true; 145 return true;
146 } 146 }
147 return false; 147 return false;
@@ -149,10 +149,10 @@ namespace OpenSim.Framework
149 149
150 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) 150 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID)
151 { 151 {
152 handler008 = OnAcknowledgePrimCrossed; 152 handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed;
153 if (handler008 != null) 153 if (handlerAcknowledgePrimCrossed != null)
154 { 154 {
155 handler008(regionHandle, primID); 155 handlerAcknowledgePrimCrossed(regionHandle, primID);
156 return true; 156 return true;
157 } 157 }
158 return false; 158 return false;
@@ -160,10 +160,10 @@ namespace OpenSim.Framework
160 160
161 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) 161 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
162 { 162 {
163 handler009 = OnCloseAgentConnection; 163 handlerCloseAgentConnection = OnCloseAgentConnection;
164 if (handler009 != null) 164 if (handlerCloseAgentConnection != null)
165 { 165 {
166 handler009(regionHandle, agentID); 166 handlerCloseAgentConnection(regionHandle, agentID);
167 return true; 167 return true;
168 168
169 } 169 }
@@ -177,10 +177,10 @@ namespace OpenSim.Framework
177 /// <returns></returns> 177 /// <returns></returns>
178 public virtual bool TriggerExpectChildAgent() 178 public virtual bool TriggerExpectChildAgent()
179 { 179 {
180 handler003 = OnExpectChildAgent; 180 handlerExpectChildAgent = OnExpectChildAgent;
181 if (handler003 != null) 181 if (handlerExpectChildAgent != null)
182 { 182 {
183 handler003(); 183 handlerExpectChildAgent();
184 return true; 184 return true;
185 } 185 }
186 186
@@ -195,10 +195,10 @@ namespace OpenSim.Framework
195 /// <returns></returns> 195 /// <returns></returns>
196 public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours) 196 public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
197 { 197 {
198 handler006 = OnNeighboursUpdate; 198 handlerNeighboursUpdate = OnNeighboursUpdate;
199 if (handler006 != null) 199 if (handlerNeighboursUpdate != null)
200 { 200 {
201 handler006(neighbours); 201 handlerNeighboursUpdate(neighbours);
202 return true; 202 return true;
203 } 203 }
204 204
@@ -207,9 +207,9 @@ namespace OpenSim.Framework
207 207
208 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 208 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
209 { 209 {
210 handler009 = OnCloseAgentConnection; 210 handlerCloseAgentConnection = OnCloseAgentConnection;
211 if (handler009 != null) 211 if (handlerCloseAgentConnection != null)
212 return handler009(regionHandle, agentID); 212 return handlerCloseAgentConnection(regionHandle, agentID);
213 213
214 return false; 214 return false;
215 } 215 }