livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-192 FIX fixed last issues with convex decomp merge

master
Nyx (Neal Orman) 2012-01-27 15:09:20 -05:00
parent 78e96466cb
commit f19a77047d
9 changed files with 17487 additions and 17484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>49f3d038379af818f9fc8f57cc4e313f</string>
<string>e26b6d955394e079a151ad3b0d7d5c90</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248427/arch/Linux/installer/llphysicsextensions-0.1-linux-20120126.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248566/arch/Linux/installer/llphysicsextensions-0.1-linux-20120127.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>573a0daa04bde79bd7b7b338984dfbf3</string>
<string>0afb3d1e08c56c74db31ae3e78640abc</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248427/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120125.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248567/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120127.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

21
indra/cmake/LLPhysicsExtensions.cmake
View File

@ -1,14 +1,21 @@
# -*- cmake -*-
include(Prebuilt)
use_prebuilt_binary(llphysicsextensions)
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llphysicsextensions)
set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions)
else (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llphysicsextensionsstub)
set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub)
endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include)
set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
set(LLPHYSICS_LIBRARIES
@ -21,11 +28,3 @@ if (LINUX)
list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
endif (LINUX)
# if (INSTALL_PROPRIETARY AND NOT STANDALONE)
# use_prebuilt_binary(llconvexdecomposition)
# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
# else (INSTALL_PROPRIETARY AND NOT STANDALONE)
# use_prebuilt_binary(llconvexdecompositionstub)
# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
# endif (INSTALL_PROPRIETARY AND NOT STANDALONE)

4
indra/newview/llappviewer.cpp
View File

@ -106,6 +106,7 @@
#include "llvfsthread.h"
#include "llvolumemgr.h"
#include "llxfermanager.h"
#include "llphysicsextensions.h"
#include "llnotificationmanager.h"
#include "llnotifications.h"
@ -1543,6 +1544,9 @@ bool LLAppViewer::cleanup()
// shut down mesh streamer
gMeshRepo.shutdown();
// shut down Havok
LLPhysicsExtensions::quitSystem();
// Must clean up texture references before viewer window is destroyed.
if(LLHUDManager::instanceExists())
{

2
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -40,7 +40,7 @@
#include "llnavmeshstation.h"
#include "llviewerregion.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#define XUI_RENDER_OVERLAY_ON_FIXED_PHYSICS_GEOMETRY 1
#define XUI_RENDER_OVERLAY_ON_ALL_RENDERABLE_GEOMETRY 2

2
indra/newview/llfloaterpathfindingconsole.h
View File

@ -30,7 +30,7 @@
#include "llfloater.h"
#include "llnavmeshstation.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#include "llcheckboxctrl.h"
class LLSD;

2
indra/newview/llnavmeshstation.cpp
View File

@ -27,7 +27,7 @@
#include "llviewerprecompiledheaders.h"
#include "llnavmeshstation.h"
#include "llcurl.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#include "llagent.h"
#include "llviewerregion.h"
#include "llsdutil.h"

2
indra/newview/llviewerdisplay.cpp
View File

@ -77,7 +77,7 @@
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "llpostprocess.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#include "llfloaterpathfindingconsole.h"
#include "llfloaterreg.h"

2
indra/newview/llviewerwindow.cpp
View File

@ -203,7 +203,7 @@
#include "llwindowlistener.h"
#include "llviewerwindowlistener.h"
#include "llpaneltopinfobar.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#include "llfloaterpathfindingconsole.h"
#if LL_WINDOWS

2
indra/newview/pipeline.cpp
View File

@ -104,7 +104,7 @@
#include "lltoolpie.h"
#include "llcurl.h"
#include "llnotifications.h"
#include "llphysicsextensions.h"
#include "LLPathingLib.h"
#ifdef _DEBUG
// Debug indices is disabled for now for debug performance - djs 4/24/02