diff options
author | Jeff Ames | 2009-06-29 15:40:00 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-29 15:40:00 +0000 |
commit | 715f2f2798240787af802161e1b9e51402489367 (patch) | |
tree | 535708658943b89b2e965cf198dffd84d475486d | |
parent | From: Chris Yeoh <yeohc@au1.ibm.com> (diff) | |
download | opensim-SC-715f2f2798240787af802161e1b9e51402489367.zip opensim-SC-715f2f2798240787af802161e1b9e51402489367.tar.gz opensim-SC-715f2f2798240787af802161e1b9e51402489367.tar.bz2 opensim-SC-715f2f2798240787af802161e1b9e51402489367.tar.xz |
Update svn properties, add copyright header, formatting cleanup.
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISceneViewer.cs | 29 |
2 files changed, 30 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 7f335db..c0fb1c7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |||
@@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
237 | packet.Header.AckList = new uint[count]; | 237 | packet.Header.AckList = new uint[count]; |
238 | packet.Header.AppendedAcks = true; | 238 | packet.Header.AppendedAcks = true; |
239 | 239 | ||
240 | for(int i = 0; i < count; i++) | 240 | for (int i = 0; i < count; i++) |
241 | { | 241 | { |
242 | packet.Header.AckList[i] = m_PendingAcks[i]; | 242 | packet.Header.AckList[i] = m_PendingAcks[i]; |
243 | m_PendingAcksMap.Remove(m_PendingAcks[i]); | 243 | m_PendingAcksMap.Remove(m_PendingAcks[i]); |
@@ -341,7 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
341 | } | 341 | } |
342 | } | 342 | } |
343 | 343 | ||
344 | foreach(LLQueItem data in dropped) | 344 | foreach (LLQueItem data in dropped) |
345 | { | 345 | { |
346 | m_NeedAck.Remove(data.Packet.Header.Sequence); | 346 | m_NeedAck.Remove(data.Packet.Header.Sequence); |
347 | TriggerOnPacketDrop(data.Packet, data.Identifier); | 347 | TriggerOnPacketDrop(data.Packet, data.Identifier); |
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs index ef3887c..8e3f4a0 100644 --- a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs +++ b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
3 | 30 | ||
4 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |