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

* ODEPlugin

Browse Source 
** Added more realistic calculations of mass for the rest of the supported prim shapes+holes+cuts+tapers.  Previously they were the generic height * width * length. Spheres roll (Angular velocity) more realistically, etc.
This commit is contained in:
Teravus Ovares
2008-02-29 05:46:24 +00:00
parent de1024adf7
commit e333eaf4b6
3 changed files with 227 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Environment/Modules/FriendsModule.cs
View File

@@ -45,8 +45,8 @@ namespace OpenSim.Region.Environment.Modules
private List<Scene> m_scene = new List<Scene>();
Dictionary<LLUUID, ulong> m_rootAgents = new Dictionary<LLUUID, ulong>();
Dictionary<LLUUID, LLUUID> m_pendingFriendRequests = new Dictionary<LLUUID, LLUUID>();
public void Initialise(Scene scene, IConfigSource config)
@@ -66,9 +66,6 @@ namespace OpenSim.Region.Environment.Modules
scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
scene.EventManager.OnMakeChildAgent += MakeChildAgent;
scene.EventManager.OnClientClosed += ClientLoggedOut;
}
public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req)
{
@@ -90,10 +87,6 @@ namespace OpenSim.Region.Environment.Modules
client.OnDenyFriendRequest += OnDenyFriendRequest;
client.OnTerminateFriendship += OnTerminateFriendship;
}
private void ClientLoggedOut(LLUUID AgentId)
@@ -144,9 +137,9 @@ namespace OpenSim.Region.Environment.Modules
}
}
}
}
#region FriendRequestHandling
private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID,
LLUUID fromAgentSession, LLUUID toAgentID,
LLUUID imSessionID, uint timestamp, string fromAgentName,
@@ -293,7 +286,7 @@ namespace OpenSim.Region.Environment.Modules
new LLVector3(msg.Position.x, msg.Position.y, msg.Position.z), new LLUUID(msg.RegionID),
msg.binaryBucket);
}
#endregion
private ScenePresence GetPresenceFromAgentID(LLUUID AgentID)
{
ScenePresence returnAgent = null;

20
OpenSim/Region/Environment/Modules/InstantMessageModule.cs
View File

@@ -26,27 +26,39 @@
*
*/
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using Nini.Config;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules
{
public class InstantMessageModule : IRegionModule
{
private List<Scene> m_scenes = new List<Scene>();
private Hashtable m_RegionInfoCache = new Hashtable();
public void Initialise(Scene scene, IConfigSource config)
{
if (!m_scenes.Contains(scene))
lock (m_scenes)
{
m_scenes.Add(scene);
scene.EventManager.OnNewClient += OnNewClient;
scene.EventManager.OnGridInstantMessageToIMModule += OnGridInstantMessage;
if (m_scenes.Count == 0)
{
//scene.AddXmlRPCHandler("avatar_location_update", processPresenceUpdate);
}
if (!m_scenes.Contains(scene))
{
m_scenes.Add(scene);
scene.EventManager.OnNewClient += OnNewClient;
scene.EventManager.OnGridInstantMessageToIMModule += OnGridInstantMessage;
}
}
}