[PlaneShift-svn] SF.net SVN: planeshift:[2404] trunk

[<wel...@us...>]

Revision: 2404
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2404&view=rev
Author:   weltall2
Date:     2008-11-09 22:45:17 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
Additional patch from kougaro to fix disappearing helms (correlated to FS#462)

Modified Paths:
--------------
    trunk/data/gui/inventory.xml
    trunk/docs/history.txt
    trunk/src/client/gui/inventorywindow.cpp

Modified: trunk/data/gui/inventory.xml
===================================================================
--- trunk/data/gui/inventory.xml	2008-11-09 17:47:52 UTC (rev 2403)
+++ trunk/data/gui/inventory.xml	2008-11-09 22:45:17 UTC (rev 2404)
@@ -91,7 +91,7 @@
         </subscriptions>     
     </widget>
 
-    <widget name="head" factory="pawsSlot" tooltip="Head">
+    <widget name="helm" factory="pawsSlot" tooltip="helm">
         <frame x="265" y="22" width="48" height="48" />
         <subscriptions>
             <subscribe data="sigClearSlot" />

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2008-11-09 17:47:52 UTC (rev 2403)
+++ trunk/docs/history.txt	2008-11-09 22:45:17 UTC (rev 2404)
@@ -17,6 +17,7 @@
 - DB VERSION BUMP
 - Removed a duplicate define in messages.h, thanks to bovek for finding it,
   and made the other ones look a bit better alligned
+- Additional patch from kougaro to fix disappearing helms (correlated to FS#462)
   
 
 *** 2008-11-8 by Keith Fulton

Modified: trunk/src/client/gui/inventorywindow.cpp
===================================================================
--- trunk/src/client/gui/inventorywindow.cpp	2008-11-09 17:47:52 UTC (rev 2403)
+++ trunk/src/client/gui/inventorywindow.cpp	2008-11-09 22:45:17 UTC (rev 2404)
@@ -136,7 +136,7 @@
     SetupSlot("righthand");
     SetupSlot("leftfinger");
     SetupSlot("rightfinger");
-    SetupSlot("head");
+    SetupSlot("helm");
     SetupSlot("neck");
     SetupSlot("back");
     SetupSlot("arms");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.