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

Thank you kindly, Nlin for a patch that:

Browse Source 
Adds a new method to IClientAPI to allow adding message handlers 
for GenericMessages (of which "autopilot" is one). Part 2 adds a 
specific autopilot handler in ScenePresence.cs.
2) Removing unused variables and functions.
3) Simplifying the navigation logic in ScenePresence.cs. The 
original patch was somewhat complex because it included orientation
logic for a future enhancement of orienting the avatar to point 
towards the direction being walked. Currently this isn't working, 
though, so I removed the orientation code, which leaves just the 
smaller and hopefully simpler-to-understand movement code.
This commit is contained in:
Charles Krinke
2008-11-27 05:16:47 +00:00
parent 714ca971d6
commit 921692a15f
6 changed files with 200 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>();
protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
protected IScene m_scene;
@@ -608,6 +609,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return result;
}
public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
{
bool result = false;
lock (m_genericPacketHandlers)
{
if (!m_genericPacketHandlers.ContainsKey(MethodName))
{
m_genericPacketHandlers.Add(MethodName, handler);
result = true;
}
}
return result;
}
/// <summary>
/// Try to process a packet using registered packet handlers
/// </summary>
@@ -3457,21 +3472,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public bool HandleGenericMessage(IClientAPI sender, Packet pack)
{
GenericMessagePacket gmpack = (GenericMessagePacket) pack;
handlerGenericMessage = OnGenericMessage;
List<string> msg = new List<string>();
if (handlerGenericMessage != null)
if (m_genericPacketHandlers.Count == 0) return false;
handlerGenericMessage = null;
string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim();
if(m_genericPacketHandlers.TryGetValue(method, out handlerGenericMessage))
{
string method = Util.FieldToString(gmpack.MethodData.Method);
foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList)
{
msg.Add(Util.FieldToString(block.Parameter));
}
List<string> msg = new List<string>();
handlerGenericMessage(this, method, msg);
if (handlerGenericMessage != null)
{
foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList)
{
msg.Add(Util.FieldToString(block.Parameter));
}
try
{
handlerGenericMessage(sender, method, msg);
return true;
}
catch (Exception ex)
{
}
}
}
return true;
return false;
}
public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack)
@@ -3965,12 +3989,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
#region Scene/Avatar
case PacketType.GenericMessage:
GenericMessagePacket gmpack = (GenericMessagePacket)Pack;
// case PacketType.GenericMessage:
// GenericMessagePacket gmpack = (GenericMessagePacket)Pack;
DecipherGenericMessage(Utils.BytesToString(gmpack.MethodData.Method), gmpack.MethodData.Invoice, gmpack.ParamList);
// DecipherGenericMessage(Utils.BytesToString(gmpack.MethodData.Method), gmpack.MethodData.Invoice, gmpack.ParamList);
break;
// break;
case PacketType.AvatarPropertiesRequest:
AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;