summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-18Make "Log In" button (etc.) move with start/grid combo visibility.Nat Goodspeed
The "Start at:" combo box and the grid-selector box can be turned on and off with checkboxes on the Preferences floater. Break the bottom-left layout_panel on panel_login into several different layout_panels so when these UI elements disappear, other controls move left to fill the holes. Similarly, when you turn on either or both of the UI elements in question, the remaining controls in that general bottom-left area move right to accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect widgets' containment in new layout_panel elements. Discard obsolete "mode_selection_text" and "mode_combo" translations from non- English panel_login.xml overrides.
2012-07-18merge back fixes from 3.3.4-beta5Oz Linden
2012-07-17Reinstate "Need help logging in?" link rather than question-diamond.Nat Goodspeed
Revert to corresponding original login_help text for each affected language.
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color ↵Dave Parks
values change.
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-16Use question-mark-in-diamond for help, rather than skull&crossbones.Nat Goodspeed
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-16Path-814: Corrected shader fragment compilation error.prep
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-13fix for SH-3235: Bump maps are not loaded until objects change LODXiaohong Bao
2012-07-13Disabling the phantom toggle when the object is volume-detect.Todd Stinson
2012-07-13Try to adapt non-English panel_login.xml files for Leo's new layout.Nat Goodspeed
en/panel_login.xml had to be changed to enlarge certain fields for other languages (rather than overriding sizes in each of several other languages). Still need to translate new create_account_text and verify guessed log_in_text.
2012-07-13Merge from lindenlab/viewmaster so we can get rid of itsimon@Simon-PC.lindenlab.com
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-13Try reorganizing panel_login.xml per Leo's redesign.Nat Goodspeed
This includes replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT: Start now" button, requiring a small tweak to the C++ code to Do The Right Thing when the button (vs. the link) is clicked.
2012-07-12Cleaning up some runtime output warning messages about invalid XUI syntax.Todd Stinson
2012-07-12fix for SH-3237: cached sculpties do not load at the correct LOD.Xiaohong Bao
2012-07-12Better optimization for loading avatar names that are already cached.Todd Stinson
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-11STORM-1898 Add "Copy SLURL" to context menu when right clicking Landmarks in ↵Jonathan Yap
Inventory
2012-07-11fix for SH-3137: delay to issue new http fetching requests if http ↵Xiaohong Bao
connection failure happens
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-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-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-10Adding the example use type labels to the pathfinding linksets floater.Todd Stinson
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-06Automated merge with https://bitbucket.org/VirLinden/dranoXiaohong Bao
2012-07-06fix for SH-3234: Map tile fetching broken in drano buildXiaohong Bao
2012-07-06trivial: convert to Unix line endings.Xiaohong Bao