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

W00t! multiple sims!

Browse Source 
Misc bugfixes
Child agents!!!!!!
General sexy stuff
This commit is contained in:
gareth
2007-04-15 02:31:34 +00:00
parent ba7aeb1479
commit f9b7cc53de
9 changed files with 129 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim.RegionServer/SimClient.cs
View File

@@ -54,6 +54,7 @@ namespace OpenSim
public LLUUID AgentID;
public LLUUID SessionID;
public LLUUID SecureSessionID = LLUUID.Zero;
public bool m_child;
public uint CircuitCode;
public world.Avatar ClientAvatar;
private UseCircuitCodePacket cirpack;
@@ -94,7 +95,7 @@ namespace OpenSim
}
}
public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode)
public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child)
{
m_world = world;
m_clientThreads = clientThreads;
@@ -103,6 +104,7 @@ namespace OpenSim
m_application = application;
m_inventoryCache = inventoryCache;
m_sandboxMode = sandboxMode;
m_child=child;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack;
@@ -228,8 +230,10 @@ namespace OpenSim
switch (Pack.Type)
{
case PacketType.CompleteAgentMovement:
ClientAvatar.CompleteMovement(m_world);
ClientAvatar.SendInitialPosition();
if(!m_child) {
ClientAvatar.CompleteMovement(m_world);
ClientAvatar.SendInitialPosition();
}
break;
case PacketType.RegionHandshakeReply:
m_world.SendLayerData(this);
@@ -476,16 +480,18 @@ namespace OpenSim
}
break;
case PacketType.AgentAnimation:
AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
for (int i = 0; i < AgentAni.AnimationList.Length; i++)
{
if (AgentAni.AnimationList[i].StartAnim)
{
ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID;
ClientAvatar.anim_seq = 1;
ClientAvatar.SendAnimPack();
}
}
if(!m_child) {
AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
for (int i = 0; i < AgentAni.AnimationList.Length; i++)
{
if (AgentAni.AnimationList[i].StartAnim)
{
ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID;
ClientAvatar.anim_seq = 1;
ClientAvatar.SendAnimPack();
}
}
}
break;
case PacketType.ObjectSelect:
ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;