diff --git a/OpenMetaverse/Types/Utils.cs b/OpenMetaverse/Types/Utils.cs index 8bdb20ff..c599696b 100644 --- a/OpenMetaverse/Types/Utils.cs +++ b/OpenMetaverse/Types/Utils.cs @@ -452,7 +452,7 @@ namespace OpenMetaverse /// A null-terminated UTF8 byte array public static byte[] StringToBytes(string str) { - if (str.Length == 0) { return new byte[0]; } + if (String.IsNullOrEmpty(str)) { return new byte[0]; } if (!str.EndsWith("\0")) { str += "\0"; } return System.Text.UTF8Encoding.UTF8.GetBytes(str); } @@ -464,6 +464,9 @@ namespace OpenMetaverse ///// The converted byte array public static byte[] HexStringToBytes(string hexString) { + if (String.IsNullOrEmpty(hexString)) + return new byte[0]; + StringBuilder stripped = new StringBuilder(hexString.Length); char c; diff --git a/Programs/Simian/Extensions/ObjectManager.cs b/Programs/Simian/Extensions/ObjectManager.cs index a447dc8e..8e59eb37 100644 --- a/Programs/Simian/Extensions/ObjectManager.cs +++ b/Programs/Simian/Extensions/ObjectManager.cs @@ -67,6 +67,8 @@ namespace Simian.Extensions } } + position.Z += scale.Z * 0.5f; + #endregion Position Calculation #region Foliage Handling