From 5144fd6b32ab623dddb781a726bea142d05fc3cc Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Wed, 27 Aug 2008 23:41:25 +0000
Subject: [PATCH] * Added a null check in Utils.StringToBytes() * Corrected Z
 position in Simian ObjectAddHandler

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2176 52acb1d6-8a22-11de-b505-999d5b087335
---
 OpenMetaverse/Types/Utils.cs                | 5 ++++-
 Programs/Simian/Extensions/ObjectManager.cs | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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
         /// <returns>A null-terminated UTF8 byte array</returns>
         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
         ///// <returns>The converted byte array</returns>
         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