summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-07-12merge MAINT-1253 fixOz Linden
2012-07-11Fix merge issues - duplicate insertions of codesimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no ↵Matthew Breindel (Falcon)
longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-1253 Rigged meshes in the upload model window now have a material ↵prep
applied instead of white.
2012-07-11Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to ↵Matthew Breindel (Falcon)
enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug
2012-07-11Merging main havok-development-hkai and oz's havok-development-hkaiMatthew Breindel (Falcon)
2012-07-10PATH-807: BUGFIX Filtering which objects will contain the right-click ↵Todd Stinson
context-sensitive menu option of "Show in linksets...".
2012-07-10Updating Havok.cmake to support all 3 major build configurations on all ↵Matthew Breindel (Falcon)
platforms. This is incomplete and requires additional changes to the 3p-havok-source repo and the llphysicsextensions-src repo.
2012-07-10Adding the example use type labels to the pathfinding linksets floater.Todd Stinson
2012-07-10experimental - try 10.6 SDK and lvmgcc42 on TeamCityOz Linden
2012-07-09Removing the change to LLPhysicsExtensions.cmake that was accidentally ↵Todd Stinson
committed in changes set cf029fb1d6ee.
2012-07-09BUGFIX: Correcting a crash issue that was caused by the rebake navmesh ↵Todd Stinson
callback handler unexpectedly changing the navmesh state.
2012-07-09merge changes for DRTVWR-175Oz Linden
2012-07-09correct dos line endingsOz Linden
2012-07-09merge back more late beta fixes from 3.3.4Oz Linden
2012-07-09merge changes for DRTVWR-177Oz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-08merge up to latest integration branchOz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
2012-07-05Adding the pathfinding attributes to the object profile panel.Todd Stinson
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2012-07-05successful build with llphysicsextensions stubOz Linden
2012-07-05begin integrating building of llphysicsextensions from source here (incomplete)Oz Linden
2012-07-03Adding an import for the new RelWithDebInfo build of the physics extensions ↵Todd Stinson
library.
2012-07-03PATH-805: guard all uses of sInstance in LLPanelLoginOz Linden
2012-07-03FIX INTL-99 set32 translation for 8 languageseli
2012-07-03remove some cmake output that is no longer neededOz Linden
2012-07-03merge up to latest pathfinding project viewerOz Linden
2012-07-03PATH-802: fixed check for different grid in chat SLURLSOz Linden
2012-07-02merge back changes from 3.3.4-beta2Oz Linden
2012-07-02improve logging of invalid grid definitions, prevent clashes with old viewersOz Linden
2012-07-02disable alignment tests in debug builds (where they fail)Oz Linden
2012-06-29Ensuring that the code and tests build correctly when HACKED_GODLIKE_VIEWER ↵Todd Stinson
is defined.
2012-06-29PATH-797: BUGFIX Altering how the rows are being added to the scrolllist ↵Todd Stinson
widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally.
2012-06-29Added test back in, skip() call need to be removed.simon@Simon-PC.lindenlab.com
2012-06-29merge changes for DRTVWR-174Oz Linden
2012-06-29Merge with viewer-betacallum
2012-06-28Ensuring that the Show in Linksets and Show in Characters right-click menu ↵Todd Stinson
option is only show on pathfinding-enabled regions.
2012-06-28Ensuring that the linksets filters are cleared before attempting to select ↵Todd Stinson
an object from right-click in-world menu.
2012-06-28Removing the SERVER_SIDE_OWNER_ROLLOUT_COMPLETE ifdef.Todd Stinson
2012-06-28Cleaning up new files in preparation for merge into viewer-release.Todd Stinson
2012-06-28mergeDave Parks
2012-06-28mergeDave Parks
2012-06-27Removing unreferenced methods from the LLRenderNavPrim class.Todd Stinson
2012-06-27MAINT-1204 Fix for crash on selecting a texture anywhere other than the ↵Dave Parks
build tools.
2012-06-27Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078Kelly Washington
2012-06-27Minor changes to pathfinding-specific wordings.Todd Stinson