summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30line munging for merge warn-on-failure:unix-eolBrad Payne (Vir Linden)
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-27sync with viewer-releaseeli
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-27increment version to 3.4.1Oz Linden
2012-07-26Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-07-25increment version to 3.4.0Oz Linden
2012-07-25SH-3258 WIP Adding new switching of new vs old appearance based on ↵Nyx (Neal Orman)
appearance message Not all appearance messages on a region will be new or old style at all times. Thus we're using a specific flag to mark the new appearance messages.
2012-07-25pull latest pathfinding changes from integration branchOz Linden
2012-07-24Adding a group identifier to the group objects in the pathfinding linksets ↵Todd Stinson
and characters floaters.
2012-07-24merge up to latest viewer-pathfinding (including 3.3.4)Oz Linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-24Engage dormant first-login-this-install popup message.Nat Goodspeed
Although the XUI for this popup, and the code to display and respond to it, have been present from the first rev in the current viewer repository, I can find no trace of it ever having been called. Reword embedded link in popup message in each supported language: directly mentioning secondlife.com in display text engages anti-URL-spoofing logic, causing the popup to display the whole messy URL with sourceid and lang params. Change to say "Second Life web site" instead -- needs translations.
2012-07-24In getUniqueID(), don't forget to reset formatting on log stream.Nat Goodspeed
Otherwise later log fields start showing up with zero fill, etc.
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23PATH-781: Pulling in the new 'owner_is_group' field into the pathfinding object.Todd Stinson
2012-07-23a trivial code change for SH-3073. The change makes sure to clear the ↵Xiaohong Bao
texture fetching queue ONLY once during a teleporting.
2012-07-23Fix LLMachineID::getUniqueID() LL_DEBUGS log output.Nat Goodspeed
getUniqueID() was logging six somewhat random bytes as garbage characters. Change to produce a hex string instead.
2012-07-23Fix for path-826. Safeguarding against a mull weight being usedprep
2012-07-21fix finding havok libs in relwithdebinfo mode (uses release unless ↵Oz Linden
LL_DEBUG_HAVOK is used
2012-07-20refactor to build llphysicsextensions_tpv package for sublicenseesOz Linden
2012-07-19fix for SH-3238: Textures are loaded at lower detail on subsequent log-insXiaohong Bao
2012-07-19Move "remember password" checkbox right a few pixelsNat Goodspeed
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-18Setting the description column of the linkset floater to be a fixed width. ↵Todd Stinson
Having multiple dynamic width columns apparently prevents other columns from being manually resized by the user.
2012-07-18Updating the build tools floater to better handle multi-line creator and ↵Todd Stinson
owner names.
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-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-17SH-3258 WIP revert to server-generated texturesNyx (Neal Orman)
After exiting appearance mode, next server-generated appearance message should over-ride the locally-generated textures.
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-17Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-07-16Use question-mark-in-diamond for help, rather than skull&crossbones.Nat Goodspeed
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-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16Automated merge with https://bitbucket.org/VirLinden/sunshineNyx (Neal Orman)
2012-07-16SH-3261 WIP Updated texture switching codeNyx (Neal Orman)
Updated texture switching code to use the proper request URL, even if reverting to a "last known good" baked texture UUID. Viewer should now switch to a locally-generated composite on entering appearance mode, and should remain using such until a new appearance message is received. Still to do: handling adjacent regions with varying support for the new system, fixing switch back to server-generated bakes.
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