Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge

author: Melanie 2011-10-25 01:51:24 +0100
committer: Melanie 2011-10-25 01:51:24 +0100
commit: 2895789bd0dbbfcd01903ddcc3c8c961ef612fbc (patch)
tree: f8170f3533497ae90e9de1b6d542cac31a22fea8 /OpenSim/Region/OptionalModules
parent: Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge (diff)
parent: refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... (diff)
download: opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.zip
opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.gz
opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.bz2
opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index c92f121..a3b65cf 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        }
-        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
+        public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
        {
        }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 253fdee..fd2b9c7 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -640,7 +640,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        {
        }
-        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
+        public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
        {
        }
author	Melanie	2011-10-25 01:51:24 +0100
committer	Melanie	2011-10-25 01:51:24 +0100
commit	2895789bd0dbbfcd01903ddcc3c8c961ef612fbc (patch)
tree	f8170f3533497ae90e9de1b6d542cac31a22fea8 /OpenSim/Region/OptionalModules
parent	Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge (diff)
parent	refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... (diff)
download	opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.zip opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.gz opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.bz2 opensim-SC_OLD-2895789bd0dbbfcd01903ddcc3c8c961ef612fbc.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index c92f121..a3b65cf 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1068		1068
1069	}	1069	}
1070		1070
1071	public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)	1071	public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
1072	{	1072	{
1073		1073
1074	}	1074	}


diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 253fdee..fd2b9c7 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -640,7 +640,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
640	{	640	{
641	}	641	}
642		642
643	public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)	643	public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
644	{	644	{
645	}	645	}
646		646