From 715f2f2798240787af802161e1b9e51402489367 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 29 Jun 2009 15:40:00 +0000 Subject: Update svn properties, add copyright header, formatting cleanup. --- .../ClientStack/LindenUDP/LLPacketHandler.cs | 4 +-- .../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 packet.Header.AckList = new uint[count]; packet.Header.AppendedAcks = true; - for(int i = 0; i < count; i++) + for (int i = 0; i < count; i++) { packet.Header.AckList[i] = m_PendingAcks[i]; m_PendingAcksMap.Remove(m_PendingAcks[i]); @@ -341,7 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - foreach(LLQueItem data in dropped) + foreach (LLQueItem data in dropped) { m_NeedAck.Remove(data.Packet.Header.Sequence); 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 @@ -using System; +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Framework.Interfaces -- cgit v1.1