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

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
This commit is contained in:
Melanie
2011-11-04 01:18:37 +00:00
parent 457195466d b8d50b10fb
commit 24235006f4
27 changed files with 430 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1025,7 +1025,7 @@ namespace OpenSim.Region.Framework.Scenes
public PrimitiveBaseShape Shape
{
get { return m_shape; }
set { m_shape = value; }
set { m_shape = value;}
}
/// <summary>
@@ -1389,12 +1389,12 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="AgentID"></param>
private void SendRootPartPropertiesToClient(UUID AgentID)
{
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
m_parentGroup.Scene.ForEachClient(delegate(IClientAPI client)
{
// Ugly reference :(
if (avatar.UUID == AgentID)
if (client.AgentId == AgentID)
{
m_parentGroup.SendPropertiesToClient(avatar.ControllingClient);
m_parentGroup.SendPropertiesToClient(client);
}
});
}
@@ -1514,9 +1514,9 @@ namespace OpenSim.Region.Framework.Scenes
if (volume < 0)
volume = 0;
m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
m_parentGroup.Scene.ForEachRootClient(delegate(IClientAPI client)
{
sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
client.SendAttachedSoundGainChange(UUID, (float)volume);
});
}
@@ -2270,7 +2270,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{
@@ -2401,7 +2401,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{
@@ -2524,7 +2524,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{