summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-08-08mergeBrad Payne (Vir Linden)
2012-08-08merge changes for DRTVWR-189Oz Linden
2012-08-07merge changes for DRTVWR-188Oz Linden
2012-08-06PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix ↵Todd Stinson
for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation.
2012-08-03Added viewer param for appearance message versionBrad Payne (Vir Linden)
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-02Merge viewer-horde-fixes -> sunshineDon Kjer
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02Added AppearanceData block to AvatarAppearance messageDon Kjer
2012-08-02Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-08-01FIX INTL-100 Frrench linguistic fixeseli
2012-08-01sync with viewer-dev for 'fr'eli
2012-08-01sync with viewer-dev for 'ja'eli
2012-08-01sync with viewer-dev for changes and new files for 'en'eli
2012-08-01sync with viewer-dev, removing obsolete fileseli
2012-08-01Merge MAINT-1270 fixsimon@Simon-PC.lindenlab.com
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31Path-643. Once the preferences panel is closed (either through ok or ↵prep@lindenlab.com
cancel), the pathing console rebuilds the gfx data.
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-26Merge viewer-development -> viewer-horde-fixesDon Kjer
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 to viewer-developmentoOz Linden
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 for path-826. Safeguarding against a mull weight being usedprep
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-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-18merge back fixes from 3.3.4-beta5Oz Linden
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-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