ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source 
This brings careminster on the level of master. To be tested
This commit is contained in:
Melanie
2010-03-03 02:07:03 +00:00
parent 01c4bb4a5e 14073831d2
commit 028a87fe37
501 changed files with 26121 additions and 46964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ using OpenMetaverse;
using OpenMetaverse.Imaging;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Hypergrid;
using OpenSim.Services.Interfaces;
using log4net;
using System.Reflection;

4960
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

File diff suppressed because it is too large Load Diff

4
OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
View File

@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void Initialise(UUID fileID, string fileName)
{
m_asset = new AssetBase(fileID, fileName, type);
m_asset = new AssetBase(fileID, fileName, type, UUID.Zero.ToString());
m_asset.Data = new byte[0];
m_asset.Description = "empty";
m_asset.Local = true;
@@ -212,6 +212,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void RequestStartXfer(IClientAPI pRemoteClient)
{
m_asset.Metadata.CreatorID = pRemoteClient.AgentId.ToString();
if (!String.IsNullOrEmpty(m_asset.Name))
{
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));

10
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@@ -596,15 +596,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
catch (MalformedDataException)
{
m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse packet from {0}:\n{1}",
buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
}
// Fail-safe check
if (packet == null)
{
m_log.Warn("[LLUDPSERVER]: Couldn't build a message from incoming data " + buffer.DataLength +
" bytes long from " + buffer.RemoteEndPoint);
m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}:",
buffer.DataLength, buffer.RemoteEndPoint);
m_log.Error(Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
return;
}
@@ -919,7 +918,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Remove this client from the scene
IClientAPI client;
if (m_scene.TryGetClient(udpClient.AgentID, out client))
{
client.IsLoggingOut = true;
client.Close();
}
}
private void IncomingPacketHandler()

9
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -56,13 +56,6 @@ namespace OpenSim.Region.ClientStack
protected uint m_httpServerPort;
public CommunicationsManager CommunicationsManager
{
get { return m_commsManager; }
set { m_commsManager = value; }
}
protected CommunicationsManager m_commsManager;
protected StorageManager m_storageManager;
protected ClientStackManager m_clientStackManager;
@@ -111,6 +104,8 @@ namespace OpenSim.Region.ClientStack
m_log.Info("[REGION]: Starting HTTP server");
m_httpServer.Start();
MainServer.Instance = m_httpServer;
base.StartupSpecific();
}