summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-07-12MAINT-1262 Fix for crash when setting graphics to LowDave Parks
2012-07-12PATH-807: Ensuring that the "Show in linksets..." and "Show in ↵Todd Stinson
characters..." right-click menu option does not show for objects outside the current region.
2012-07-12Removing debug settings that were in place for pathfinding simulator testing.Todd Stinson
2012-07-12PATH-807: Adding an additional check for if the object is marked as ↵Todd Stinson
volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
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-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-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-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-05MAINT-436 FIXED Set focus to line editor if it exists in alert toastmaxim_productengine
2012-08-06MAINT-73 FIXED Hide Stand/Stop flying panel after pressing Ctrl-Shift-Umaxim_productengine
2012-08-03Merge back changes from viewer-lion with latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-07-28Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-28Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175Nat Goodspeed
2012-07-27MAINT-1175 FIX Severe performance issues on 3.3.2 (258114) Release and 3.3.3 ↵Richard Linden
(259197) Beta in "Add scroll list item" removed linear scan for namelist items and used weak reference (LLHandle) instead
2012-07-19MAINT-1175: Use workaround for comparing std::type_info* on gcc < 4.4.Nat Goodspeed
We now specialize std::less<const std::type_info*> to use std::type_info::before(), and on Windows and Mac that Just Works. It even works on Linux when using gcc 4.4+: more recent implementations of gcc's std::type_info::before() apparently do name()-string comparisons internally. It doesn't work so well on Linux with gcc 4.1, though, and that's the compiler we still use on our Linux build-farm machines. But rather than give up, perform explicit name()-string comparison in that case.
2012-07-18MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.Nat Goodspeed
Instead of forbidding std::map<const std::type_info*, ...> outright (which includes LLRegistry<const std::type_info*, ...> and LLRegistrySingleton<const std::type_info*, ...>), try to make it work by specializing std::less<const std::type_info*> to use std::type_info::before(). Make LLRegistryDefaultComparator<T> use std::less<T> so it can capitalize on that specialization.
2012-07-18MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()>Nat Goodspeed
2012-07-18Backed out changeset a25bfa87418d (using std::type_info::name())Nat Goodspeed
The changeset above touched every consumer of the two LLRegistrySingletons originally defined with std::type_info* as keys. Those two LLRegistrySingletons were changed to use const char* as keys, then all consumers were changed to pass std::type_info::name() instead of the plain std::type_info* pointer -- to deal with the observed fact that on Linux, a given type might produce different std::type_info* pointers in different load modules. Since then, Richard turned up the fascinating fact that at least some implementations of gcc's std::type_info::before() method already accommodate this peculiarity. It seems worth backing out the (dismayingly pervasive) change to see if properly using std::type_info::before() as the map comparator will work just as well, with conceptually simpler source code. This backout is transitional: we don't expect things to build/run properly until we've cherry-picked certain other pertinent changes.
2012-07-16MAINT-1175: Pass boost::unordered_map hash/equals functors for char*.Nat Goodspeed
boost::unordered_map<const char*, ...> does NOT, by default, "do the right thing." Give it hash and equality functors that do.
2012-07-12MAINT-1175: Linux viewer built on TC is broken, built on dev box works.Nat Goodspeed
Try to diagnose the cause of the misbehavior with a BOOST_STATIC_ASSERT.
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-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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-07 11:35:02 +0000