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

2
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -245,7 +245,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
if(m_openSim.userStatsURI != String.Empty )
if (m_openSim.userStatsURI != String.Empty )
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
}

8
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -413,9 +413,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
private bool getBoolean(Hashtable requestData, string tag, bool defv)
{
// If an access value has been provided, apply it.
if(requestData.Contains(tag))
if (requestData.Contains(tag))
{
switch(((string)requestData[tag]).ToLower())
switch (((string)requestData[tag]).ToLower())
{
case "true" :
case "t" :
@ -670,7 +670,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{
List<ILandObject> parcels = ((Scene)newscene).LandChannel.AllParcels();
foreach(ILandObject parcel in parcels)
foreach (ILandObject parcel in parcels)
{
parcel.landData.Flags |= (uint) Parcel.ParcelFlags.AllowVoiceChat;
parcel.landData.Flags |= (uint) Parcel.ParcelFlags.UseEstateVoiceChan;
@ -826,7 +826,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
bool enableVoice = getBoolean(requestData, "enable_voice", true);
List<ILandObject> parcels = ((Scene)scene).LandChannel.AllParcels();
foreach(ILandObject parcel in parcels)
foreach (ILandObject parcel in parcels)
{
if (enableVoice)
{

8
OpenSim/Framework/InventoryItemBase.cs
View File

@ -151,9 +151,9 @@ namespace OpenSim.Framework
/// </value>
public int CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
public object Clone()
{
return MemberwiseClone();
}
public object Clone()
{
return MemberwiseClone();
}
}
}

2
OpenSim/Framework/PacketPool.cs
View File

@ -210,7 +210,7 @@ namespace OpenSim.Framework
public static T GetDataBlock<T>() where T: new()
{
lock(DataBlocks)
lock (DataBlocks)
{
if (DataBlocks.ContainsKey(typeof(T)) && DataBlocks[typeof(T)].Count > 0)
{

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

@ -36,9 +36,9 @@ using System.Reflection;
namespace OpenSim.Region.ClientStack.LindenUDP
{
/// <summary>
/// We use this class to store image data and associated request data and attributes
/// </summary>
/// <summary>
/// We use this class to store image data and associated request data and attributes
/// </summary>
public class J2KImage
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -135,6 +135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
}
public int LastPacketSize()
{
if (m_packetNumber == 1)
@ -146,8 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lastsize = cImagePacketSize;
}
return lastsize;
}
}
public int CurrentBytePosition()
{
@ -234,7 +234,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//Send the packet
client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
}
if (complete)
{
@ -257,7 +256,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (m_packetNumber <= m_stopPacket)
{
bool SendMore = true;
if (!m_sentinfo || (m_packetNumber == 0))
{
@ -274,7 +272,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_packetNumber = 2;
}
int count=0;
int count = 0;
while (SendMore && count < 5 && m_packetNumber <= m_stopPacket)
{
count++;
@ -284,13 +282,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_packetNumber > m_stopPacket)
{
return true;
}
}
}
return false;
}
@ -343,12 +337,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
else
{
//discardLevel of -1 means just update the priority
if (m_requestedDiscardLevel != -1)
{
//Evaluate the discard level
//First, is it positive?
if (m_requestedDiscardLevel >= 0)
@ -387,13 +378,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_completedSendAtCurrentDiscardLevel = false;
}
}
}
}
}
}
}
}

2
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@ -248,7 +248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void Cancel(uint sequence)
{
while(contents.Remove(sequence))
while (contents.Remove(sequence))
;
}

66
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1861,7 +1861,7 @@ namespace OpenSim.Region.Framework.Scenes
{
bool welcome = true;
if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
if (m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
{
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
@ -1876,7 +1876,7 @@ namespace OpenSim.Region.Framework.Scenes
welcome = false;
}
if(!welcome)
if (!welcome)
{
try
{
@ -1899,46 +1899,46 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
SubscribeToClientEvents(client);
ScenePresence presence;
SubscribeToClientEvents(client);
ScenePresence presence;
if (m_restorePresences.ContainsKey(client.AgentId))
{
m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
if (m_restorePresences.ContainsKey(client.AgentId))
{
m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
presence = m_restorePresences[client.AgentId];
m_restorePresences.Remove(client.AgentId);
presence = m_restorePresences[client.AgentId];
m_restorePresences.Remove(client.AgentId);
// This is one of two paths to create avatars that are
// used. This tends to get called more in standalone
// than grid, not really sure why, but as such needs
// an explicity appearance lookup here.
AvatarAppearance appearance = null;
GetAvatarAppearance(client, out appearance);
presence.Appearance = appearance;
// This is one of two paths to create avatars that are
// used. This tends to get called more in standalone
// than grid, not really sure why, but as such needs
// an explicity appearance lookup here.
AvatarAppearance appearance = null;
GetAvatarAppearance(client, out appearance);
presence.Appearance = appearance;
presence.initializeScenePresence(client, RegionInfo, this);
presence.initializeScenePresence(client, RegionInfo, this);
m_sceneGraph.AddScenePresence(presence);
m_sceneGraph.AddScenePresence(presence);
lock (m_restorePresences)
{
Monitor.PulseAll(m_restorePresences);
}
}
else
{
m_log.DebugFormat(
"[SCENE]: Adding new child agent for {0} in {1}",
client.Name, RegionInfo.RegionName);
lock (m_restorePresences)
{
Monitor.PulseAll(m_restorePresences);
}
}
else
{
m_log.DebugFormat(
"[SCENE]: Adding new child agent for {0} in {1}",
client.Name, RegionInfo.RegionName);
CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
CreateAndAddScenePresence(client);
}
CreateAndAddScenePresence(client);
}
m_LastLogin = Environment.TickCount;
EventManager.TriggerOnNewClient(client);
m_LastLogin = Environment.TickCount;
EventManager.TriggerOnNewClient(client);
}
}

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
{
public interface IUserService