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

* Continuing refactoring of presence

Browse Source 
* Deleted stub ScenePresence.Body.cs
  * Added stub Region classes

The idea is to, at first, have every ScenePresence have one RegionPresence, moving code over to it until we can detach the two classes and not have a ScenePresence for every RegionPresence.
This commit is contained in:
lbsa71
2007-09-21 03:13:49 +00:00
parent d3050724d8
commit 409bcd999d
16 changed files with 151 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules
string mess = inputLine.Substring(inputLine.IndexOf(m_channel));
m_scene.ForEachScenePresence(delegate(ScenePresence presence)
{
presence._ControllingClient.SendChatMessage(
presence.ControllingClient.SendChatMessage(
Helpers.StringToField(mess), 255, pos, "IRC:",
LLUUID.Zero);
});
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules
int dis = -1000;
//err ??? the following code seems to be request a scenePresence when it already has a ref to it
avatar = m_scene.GetScenePresence(presence._ControllingClient.AgentId);
avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId);
if (avatar != null)
{
dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos);
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules
if ((dis < 10) && (dis > -10))
{
//should change so the message is sent through the avatar rather than direct to the ClientView
presence._ControllingClient.SendChatMessage(message,
presence.ControllingClient.SendChatMessage(message,
type,
fromPos,
fromName,
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Environment.Modules
if ((dis < 30) && (dis > -30))
{
//Console.WriteLine("sending chat");
presence._ControllingClient.SendChatMessage(message,
presence.ControllingClient.SendChatMessage(message,
type,
fromPos,
fromName,
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules
case 2: // Shout
if ((dis < 100) && (dis > -100))
{
presence._ControllingClient.SendChatMessage(message,
presence.ControllingClient.SendChatMessage(message,
type,
fromPos,
fromName,
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Environment.Modules
break;
case 0xff: // Broadcast
presence._ControllingClient.SendChatMessage(message, type,
presence.ControllingClient.SendChatMessage(message, type,
fromPos,
fromName,
fromAgentID);