diff options
author | Teravus Ovares | 2008-05-11 21:27:12 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-11 21:27:12 +0000 |
commit | a01b415d6c3fa2ee650b23b7d78432a2eac5a2a7 (patch) | |
tree | 8594200f74b76d91c2d2fc2c3f57e06e0ee565ea /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | * Fixed null reference exception when rezzing an object from inventory with a... (diff) | |
download | opensim-SC-a01b415d6c3fa2ee650b23b7d78432a2eac5a2a7.zip opensim-SC-a01b415d6c3fa2ee650b23b7d78432a2eac5a2a7.tar.gz opensim-SC-a01b415d6c3fa2ee650b23b7d78432a2eac5a2a7.tar.bz2 opensim-SC-a01b415d6c3fa2ee650b23b7d78432a2eac5a2a7.tar.xz |
0001199: [PATCH] Add support for default animations
From Melanie... Thanks Melanie!
.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 8506912..68e1a0d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -96,6 +96,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
96 | 96 | ||
97 | private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL | 97 | private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL |
98 | 98 | ||
99 | private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); | ||
100 | |||
101 | |||
99 | /* protected variables */ | 102 | /* protected variables */ |
100 | 103 | ||
101 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = | 104 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = |
@@ -326,6 +329,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
326 | 329 | ||
327 | m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion()); | 330 | m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion()); |
328 | 331 | ||
332 | InitDefaultAnimations(); | ||
333 | |||
334 | |||
329 | m_scene = scene; | 335 | m_scene = scene; |
330 | m_assetCache = assetCache; | 336 | m_assetCache = assetCache; |
331 | 337 | ||
@@ -3097,6 +3103,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3097 | 3103 | ||
3098 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); | 3104 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); |
3099 | } | 3105 | } |
3106 | private void InitDefaultAnimations() | ||
3107 | { | ||
3108 | } | ||
3109 | |||
3110 | public LLUUID GetDefaultAnimation(string name) | ||
3111 | { | ||
3112 | if(m_defaultAnimations.ContainsKey(name)) | ||
3113 | return m_defaultAnimations[name]; | ||
3114 | return LLUUID.Zero; | ||
3115 | } | ||
3100 | 3116 | ||
3101 | protected virtual bool Logout(IClientAPI client, Packet packet) | 3117 | protected virtual bool Logout(IClientAPI client, Packet packet) |
3102 | { | 3118 | { |