From f10ea8bbd4e7ca24e80b178e15e58b38a22b8589 Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Fri, 28 Sep 2012 07:28:00 +1000
Subject: [PATCH] Fixed mAtRest logic when setting static flag.

---
 Engine/source/T3D/item.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Engine/source/T3D/item.cpp b/Engine/source/T3D/item.cpp
index fbc7b7ca6..6546404e8 100644
--- a/Engine/source/T3D/item.cpp
+++ b/Engine/source/T3D/item.cpp
@@ -1279,7 +1279,7 @@ DefineEngineMethod( Item, getLastStickyNormal, const char *, (),,
 bool Item::_setStatic(void *object, const char *index, const char *data)
 {
    Item *i = static_cast<Item*>(object);
-   i->mAtRest = false;
+   i->mAtRest = dAtob(data);
    i->setMaskBits(InitialUpdateMask | PositionMask);
    return true;
 }
@@ -1294,7 +1294,7 @@ bool Item::_setRotate(void *object, const char *index, const char *data)
 void Item::initPersistFields()
 {
    addGroup("Misc");	
-   addProtectedField("static", TypeBool, Offset(mStatic, Item), &_setStatic, &defaultProtectedGetFn, "If true, the object is not moving in the world (and will not be updated through the network).\n");
+   addProtectedField("static", TypeBool, Offset(mStatic, Item), &_setStatic, &defaultProtectedGetFn, "If true, the object is not moving in the world.\n");
    addProtectedField("rotate", TypeBool, Offset(mRotate, Item), &_setRotate, &defaultProtectedGetFn, "If true, the object will automatically rotate around its Z axis.\n");
    endGroup("Misc");