OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics

master
UbitUmarov 2020-05-17 17:16:29 +01:00
parent 9ce52ed2fc
commit fe72b54652
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/Animation.cs
View File

@ -112,12 +112,13 @@ namespace OpenSim.Framework
/// <param name="args"></param> /// <param name="args"></param>
public void UnpackUpdateMessage(OSDMap args) public void UnpackUpdateMessage(OSDMap args)
{ {
if (args["animation"] != null) OSD tmp;
animID = args["animation"].AsUUID(); if (args.TryGetValue("animation", out tmp))
if (args["object_id"] != null) animID = tmp.AsUUID();
objectID = args["object_id"].AsUUID(); if (args.TryGetValue("object_id", out tmp))
if (args["seq_num"] != null) objectID = tmp.AsUUID();
sequenceNum = args["seq_num"].AsInteger(); if (args.TryGetValue("seq_num", out tmp))
sequenceNum = tmp.AsInteger();
} }
public override bool Equals(object obj) public override bool Equals(object obj)

8
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@ -676,11 +676,11 @@ namespace OpenSim.Framework
ulong handle = 0; ulong handle = 0;
string seed = ""; string seed = "";
OSDMap pair = (OSDMap)o; OSDMap pair = (OSDMap)o;
if (pair["handle"] != null) if (pair.TryGetValue("handle", out tmp))
if (!UInt64.TryParse(pair["handle"].AsString(), out handle)) if (!UInt64.TryParse(tmp.AsString(), out handle))
continue; continue;
if (pair["seed"] != null) if (pair.TryGetValue("seed", out tmp))
seed = pair["seed"].AsString(); seed = tmp.AsString();
if (!ChildrenCapSeeds.ContainsKey(handle)) if (!ChildrenCapSeeds.ContainsKey(handle))
ChildrenCapSeeds.Add(handle, seed); ChildrenCapSeeds.Add(handle, seed);
} }

6
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
View File

@ -115,7 +115,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
else else
ResetDefaultAnimation(); ResetDefaultAnimation();
} }
else if (HasAnimation(animID)) else
{ {
for (int i = 0; i < m_animations.Count; i++) for (int i = 0; i < m_animations.Count; i++)
{ {
@ -182,9 +182,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{ {
lock (m_animations) lock (m_animations)
{ {
int j = 0; int j = m_defaultAnimation.AnimID == UUID.Zero ? 0 : 1;
if (m_defaultAnimation.AnimID != UUID.Zero)
++j;
int defaultSize = m_animations.Count + j; int defaultSize = m_animations.Count + j;
animIDs = new UUID[defaultSize]; animIDs = new UUID[defaultSize];