aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-11-09 01:31:38 +0000
committerJeff Ames2008-11-09 01:31:38 +0000
commit8da726c3a8a3ab983fc11ad890a0b91016c86a1f (patch)
treea19c3a3a813bafedf876fb8943c7ef60ccbbb851 /OpenSim/Region
parentReintroduce transactionID to the parameter list for SendInstantMessage. (diff)
downloadopensim-SC_OLD-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.zip
opensim-SC_OLD-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.gz
opensim-SC_OLD-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.bz2
opensim-SC_OLD-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.xz
Update svn properties. Add copyright headers. Minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs2
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3a9c17e..c953228 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7661,7 +7661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7661 /// <param name="iface"></param> 7661 /// <param name="iface"></param>
7662 protected void RegisterInterface<T>(T iface) 7662 protected void RegisterInterface<T>(T iface)
7663 { 7663 {
7664 lock(m_clientInterfaces) 7664 lock (m_clientInterfaces)
7665 { 7665 {
7666 m_clientInterfaces.Add(typeof(T), iface); 7666 m_clientInterfaces.Add(typeof(T), iface);
7667 } 7667 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index bb2d270..194d1b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
259 public void WipeClean() 259 public void WipeClean()
260 { 260 {
261 m_log.Info("[PACKETQUEUE] Wiping Packet Queues Clean"); 261 m_log.Info("[PACKETQUEUE] Wiping Packet Queues Clean");
262 lock(this) 262 lock (this)
263 { 263 {
264 ResendOutgoingPacketQueue.Clear(); 264 ResendOutgoingPacketQueue.Clear();
265 LandOutgoingPacketQueue.Clear(); 265 LandOutgoingPacketQueue.Clear();
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index eb82ad7..0698b9a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
84 void OnClientConnect(IClientCore client) 84 void OnClientConnect(IClientCore client)
85 { 85 {
86 IClientIM clientIM; 86 IClientIM clientIM;
87 if(client.TryGet(out clientIM)) 87 if (client.TryGet(out clientIM))
88 { 88 {
89 clientIM.OnInstantMessage += OnInstantMessage; 89 clientIM.OnInstantMessage += OnInstantMessage;
90 } 90 }
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 2235be0..badb4e3 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1335 m_landList.TryGetValue(localID, out land); 1335 m_landList.TryGetValue(localID, out land);
1336 } 1336 }
1337 1337
1338 if(land == null) return; 1338 if (land == null) return;
1339 1339
1340 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(remoteClient.AgentId, land)) 1340 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(remoteClient.AgentId, land))
1341 return; 1341 return;