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

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife.Packets;
using OpenMetaverse.Packets;
namespace OpenSim.Region.ClientStack.LindenUDP
{

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

File diff suppressed because it is too large Load Diff

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

@@ -33,8 +33,8 @@ using System.Net.Sockets;
using System.Threading;
using System.Timers;
using System.Reflection;
using libsecondlife;
using libsecondlife.Packets;
using OpenMetaverse;
using OpenMetaverse.Packets;
using Timer = System.Timers.Timer;
using OpenSim.Framework;
using OpenSim.Region.ClientStack.LindenUDP;
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
public delegate void PacketDrop(Packet pack, Object id);
public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, LLUUID agentID, ThrottleOutPacketType throttlePacketType);
public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, UUID agentID, ThrottleOutPacketType throttlePacketType);
public interface IPacketHandler
{
@@ -259,9 +259,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// acks being appended to the payload, just don't send
// any with them until libsl is fixed.
//
if (packet is libsecondlife.Packets.ViewerEffectPacket)
if (packet is OpenMetaverse.Packets.ViewerEffectPacket)
return;
if (packet is libsecondlife.Packets.SimStatsPacket)
if (packet is OpenMetaverse.Packets.SimStatsPacket)
return;
// Add acks to outgoing packets

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

@@ -29,8 +29,8 @@ using System;
using System.Collections.Generic;
using System.Threading;
using System.Timers;
using libsecondlife;
using libsecondlife.Packets;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Statistics;
using OpenSim.Framework.Statistics.Interfaces;
@@ -82,9 +82,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// private long ThrottleInterval;
private Timer throttleTimer;
private LLUUID m_agentId;
private UUID m_agentId;
public LLPacketQueue(LLUUID agentId)
public LLPacketQueue(UUID agentId)
{
// While working on this, the BlockingQueue had me fooled for a bit.
// The Blocking queue causes the thread to stop until there's something
@@ -479,7 +479,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int i = 0; i < 7; i++)
Array.Reverse(throttle, j + i*singlefloat, singlefloat);
// values gotten from libsecondlife.org/wiki/Throttle. Thanks MW_
// values gotten from OpenMetaverse.org/wiki/Throttle. Thanks MW_
// bytes
// Convert to integer, since.. the full fp space isn't used.
tResend = (int) BitConverter.ToSingle(throttle, j);

8
OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
View File

@@ -27,8 +27,8 @@
using System.Net;
using System.Net.Sockets;
using libsecondlife;
using libsecondlife.Packets;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.ClientStack.LindenUDP;
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack,
ClientManager clientManager, IScene scene, AssetCache assetCache,
LLPacketServer packServer, AgentCircuitManager authenSessions,
LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP)
UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
{
return
new LLClientView(remoteEP, scene, assetCache, packServer, authenSessions, agentId, sessionId, circuitCode, proxyEP);
@@ -147,4 +147,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
client.Close(false);
}
}
}
}

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

@@ -26,7 +26,7 @@
*/
using System;
using libsecondlife.Packets;
using OpenMetaverse.Packets;
using OpenSim.Framework;
namespace OpenSim.Region.ClientStack.LindenUDP

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

@@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using libsecondlife.Packets;
using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
@@ -136,7 +136,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Return new port
// This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered.
// So the option allow_alternate_ports="true" was added to default.xml
// So the option allow_alternate_ports="true" was added to default.Xml
port = (uint)(listenPort - proxyPortOffset);
}

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

@@ -28,7 +28,7 @@
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nini.Config;
using OpenSim.Framework;
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack
// TODO: Remove this cruft once MasterAvatar is fully deprecated
//Master Avatar Setup
UserProfileData masterAvatar;
if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
if (scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero)
{
masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ClientStack
else
{
m_log.Info("[PARCEL]: No master avatar found, using null.");
scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero;
scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero;
}
scene.LoadPrimsFromStorage(regionInfo.originRegionID);