OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add copyright header. Formatting cleanup. Ignore some generated files.

0.6.5-rc1
Jeff Ames 2009-05-05 09:59:15 +00:00
parent 6ae88d129a
commit 8ea12ad6c0
9 changed files with 102 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
View File

@ -135,6 +135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1; return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
} }
public int LastPacketSize() public int LastPacketSize()
{ {
if (m_packetNumber == 1) if (m_packetNumber == 1)
@ -148,7 +149,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return lastsize; return lastsize;
} }
public int CurrentBytePosition() public int CurrentBytePosition()
{ {
if (m_packetNumber == 0) if (m_packetNumber == 0)
@ -234,7 +234,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//Send the packet //Send the packet
client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData); client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
} }
if (complete) if (complete)
{ {
@ -257,7 +256,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
if (m_packetNumber <= m_stopPacket) if (m_packetNumber <= m_stopPacket)
{ {
bool SendMore = true; bool SendMore = true;
if (!m_sentinfo || (m_packetNumber == 0)) if (!m_sentinfo || (m_packetNumber == 0))
{ {
@ -284,13 +282,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_packetNumber > m_stopPacket) if (m_packetNumber > m_stopPacket)
{ {
return true; return true;
} }
} }
} }
return false; return false;
} }
@ -343,12 +337,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
else else
{ {
//discardLevel of -1 means just update the priority //discardLevel of -1 means just update the priority
if (m_requestedDiscardLevel != -1) if (m_requestedDiscardLevel != -1)
{ {
//Evaluate the discard level //Evaluate the discard level
//First, is it positive? //First, is it positive?
if (m_requestedDiscardLevel >= 0) if (m_requestedDiscardLevel >= 0)
@ -387,13 +378,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
m_completedSendAtCurrentDiscardLevel = false; m_completedSendAtCurrentDiscardLevel = false;
} }
}
} }
} }
} }
} }
}
} }
} }

27
OpenSim/Services/Interfaces/IUserService.cs
View File

@ -1,3 +1,30 @@
/*
* 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.
*/
namespace OpenSim.Services.Interfaces namespace OpenSim.Services.Interfaces
{ {
public interface IUserService public interface IUserService