summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-1175: Properly pass LLRegistry's COMPARATOR to underlying map.Nat Goodspeed
Although LLRegistry and LLRegistrySingleton have always defined a COMPARATOR template parameter, it wasn't used for the underlying map. Therefore every type, including any pointer type, was being compared using std::less. This happens to work most of the time -- but is tripping us up now. Pass COMPARATOR to underlying std::map. Fix a couple minor bugs in LLRegistryDefaultComparator (never before used!). Specialize for const char*. Remove CompareTypeID and LLCompareTypeID because we now actively forbid using LLRegistry<std::type_info*, ...>; remove only known reference (LLWidgetNameRegistry definition).
2012-07-11MAINT-1253 Rigged meshes in the upload model window now have a material ↵prep
applied instead of white.
2012-07-11MAINT-1175: Change LLTypeInfoLookup API for future optimizations.Nat Goodspeed
Per discussion with Richard, accept the type key for insert() and find() as a template parameter rather than as std::type_info*. This permits (e.g.) some sort of compile-time prehashing for common types, without changing the API. Eliminate iterators from the API altogether, thus avoiding costs associated with transform_iterator. Fix existing references in llinitparam.h.
2012-07-11MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.Nat Goodspeed
Back out code that selects LLTypeInfoLookup for the underlying map implementation when KEY = [const] std::type_info*, because LLTypeInfoLookup's API is changing to become incompatible with std::map. Instead, fail with STATIC_ASSERT when LLRegistry's KEY is [const] std::type_info*. Fix all existing uses to use std::type_info::name() string instead.
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-10MAINT-1175: Still grappling with MSVC idiosyncracies.Nat Goodspeed
Maybe it's failing to correctly handle overloaded transform() methods?
2012-07-10MAINT-1175: Fix Windows build.Nat Goodspeed
It seems MSVC doesn't like boost::make_transform_iterator() in the context I was using it. Try directly invoking the iterator's constructor.
2012-07-10MAINT-1175: Reimplement LLTypeInfoLookup for better lookup failure.Nat Goodspeed
The original LLTypeInfoLookup implementation was based on two assumptions: small overall container size, and infrequent normal-case lookup failures. Those assumptions led to binary-searching a sorted vector, with linear search as a fallback to cover the problem case of two different type_info* values for the same type. As documented in the Jira, this turned out to be a problem. The container size was larger than expected, and failed lookups turned out to be far more common than expected. The new implementation is based on a hash map of std::type_info::name() strings, which should perform equally well in the success and failure cases: no special-case fallback logic.
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-06Automated merge with ssh://hg.lindenlab.com/simon/viewmasterXiaohong Bao
2012-07-06fix for MAINT-1201: 404 errors appear in the log when opening the world mapXiaohong Bao
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-03MAINT-1231 Investigate increasing MAX_CACHED_GROUPS in llgroupmgr.cppKelly Washington
* increased max groups to 20 * changed cache to LRU instead of 'delete half when overfull' reviewed with Baker
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-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
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-02MAINT-971 : [PUBLIC]Renaming a new inventory item while filtering item namessimon@Simon-PC.lindenlab.com
renames parent folder instead. Reviewed by Kelly
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 simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 17:37:01 +0000