Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus

indra/llcommon/stdtypes.h

@@ -80,7 +80,7 @@ typedef long long unsigned int      U64;
 typedef float               F32;
 typedef double              F64;
 
-//typedef S32               BOOL; // <FS:Ansariel> We should not need this anymore
+typedef S32               BOOL;
 typedef U8              KEY;
 typedef U32             MASK;
 typedef U32             TPACKETID;

indra/newview/llfloaterpathfindingcharacters.cpp

@@ -36,18 +36,12 @@
 #include "llfloaterreg.h"
 #include "llfloaterpathfindingobjects.h"
 #include "llhandle.h"
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
 #include "llpathfindingcharacter.h"
 #include "llpathfindingcharacterlist.h"
 #include "llpathfindingmanager.h"
 #include "llpathfindingobject.h"
 #include "llpathfindingobjectlist.h"
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "llquaternion.h"
 #include "llsd.h"
 #include "lluicolortable.h"
@@ -292,7 +286,7 @@ void LLFloaterPathfindingCharacters::showCapsule() const
                 // <FS:Ansariel> Interface in Nicky's physics stub package expects bool while Havok package still expects BOOL aka S32
 #ifdef HAVOK_TPV
                 LLPathingLib::getInstance()->createPhysicsCapsuleRep(character->getLength(), character->getRadius(),
-                    static_cast<S32>(character->isHorizontal()), character->getUUID());
+                    static_cast<BOOL>(character->isHorizontal()), character->getUUID());
 #else
                 LLPathingLib::getInstance()->createPhysicsCapsuleRep(character->getLength(), character->getRadius(),
                     character->isHorizontal(), character->getUUID());

indra/newview/llfloaterpathfindingconsole.h

@@ -33,15 +33,9 @@
 
 #include "llfloater.h"
 #include "llhandle.h"
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
 #include "llpathfindingnavmeshzone.h"
 #include "llpathfindingpathtool.h"
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "v4color.h"
 
 class LLButton;

indra/newview/llpathfindingmanager.cpp

@@ -41,11 +41,6 @@
 #include "llagent.h"
 #include "llhttpnode.h"
 #include "llnotificationsutil.h"
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
 #include "llpathfindingcharacterlist.h"
 #include "llpathfindinglinkset.h"
 #include "llpathfindinglinksetlist.h"
@@ -53,7 +48,6 @@
 #include "llpathfindingnavmeshstatus.h"
 #include "llpathfindingobject.h"
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "llsingleton.h"
 #include "llsd.h"
 #include "lltrans.h"

indra/newview/llpathfindingnavmeshzone.cpp

@@ -38,16 +38,10 @@
 #include <boost/signals2.hpp>
 
 #include "llagent.h"
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
 #include "llpathfindingmanager.h"
 #include "llpathfindingnavmesh.h"
 #include "llpathfindingnavmeshstatus.h"
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "llsd.h"
 #include "lluuid.h"
 #include "llviewercontrol.h"

indra/newview/llpathfindingpathtool.h

@@ -29,13 +29,8 @@
 
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
+
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "llsingleton.h"
 #include "lltool.h"