aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-15 16:52:48 +0000
committerJustin Clarke Casey2008-10-15 16:52:48 +0000
commit87e85489f3aa1a2f5d827cfc4941cf5fbfc45b07 (patch)
treeb2ac85ff9ef6769c84b692d5ef2d0dfaf41c0483 /OpenSim/Framework
parent* minor: disable a couple of other lines of image not found, which are pointl... (diff)
downloadopensim-SC_OLD-87e85489f3aa1a2f5d827cfc4941cf5fbfc45b07.zip
opensim-SC_OLD-87e85489f3aa1a2f5d827cfc4941cf5fbfc45b07.tar.gz
opensim-SC_OLD-87e85489f3aa1a2f5d827cfc4941cf5fbfc45b07.tar.bz2
opensim-SC_OLD-87e85489f3aa1a2f5d827cfc4941cf5fbfc45b07.tar.xz
* refactor: move viewer effect packet into LLClientView
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ClientManager.cs9
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
2 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 68c4dea..4ac9b3c 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -205,14 +205,7 @@ namespace OpenSim.Framework
205 { 205 {
206 if (LocalClients[i].AgentId != sender.AgentId) 206 if (LocalClients[i].AgentId != sender.AgentId)
207 { 207 {
208 ViewerEffectPacket packet = (ViewerEffectPacket)PacketPool.Instance.GetPacket(PacketType.ViewerEffect); 208 LocalClients[i].SendViewerEffect(effectBlockArray);
209 packet.Effect = effectBlockArray;
210
211 packet.AgentData.AgentID = LocalClients[i].AgentId;
212 packet.AgentData.SessionID = LocalClients[i].SessionId;
213 packet.Header.Reliable = false;
214 packet.Header.Zerocoded = true;
215 LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task);
216 } 209 }
217 } 210 }
218 } 211 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d5d4c34..89fc0af 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -755,6 +755,7 @@ namespace OpenSim.Framework
755 bool AddMoney(int debit); 755 bool AddMoney(int debit);
756 756
757 void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition); 757 void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition);
758 void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
758 void SendViewerTime(int phase); 759 void SendViewerTime(int phase);
759 UUID GetDefaultAnimation(string name); 760 UUID GetDefaultAnimation(string name);
760 761