summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Collapse)Author
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong ↵Brad Payne (Vir Linden)
place, avoid querying textures for which we have no authoritative data where they live
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-09MAINT-1755: Correcting behavior when llTargetOmega is called with zero spin ↵William Todd Stinson
rate.
2012-11-09Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to ↵William Todd Stinson
fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-10-25MergeKelly Washington
2012-10-15MAINT-1672: Correcting issue where the sailboat boom was not moving ↵William Todd Stinson
correctly. The isssue was that the display text for the prim was being updated, and this code path would mark the prim as having been moved when, in fact, the pipeline had not yet moved the object.
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in ↵Dave Parks
LLViewerObjectList::update, fix for error in llpolymorph
2012-09-20reapply 71673401390a: MAINT-646 Knock out some extraneous performance timersDave Parks
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-05Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-09-05Merge viewer-development -> VirLinden/sunshineDon Kjer
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-09-04MAINT-1502 User is unable to rename script inside content of object:MaksymS ProductEngine
- regression after wrong merge, full fix was done in MAINT-1228;
2012-08-31merge changes forOz Linden
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-22merge back 3.4.0-beta3 fixesOz Linden
2012-08-20merge back beta fixesOz Linden
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ↵Todd Stinson
the viewer.
2012-08-08mergeBrad Payne (Vir Linden)
2012-08-08merge changes for DRTVWR-189Oz 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-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-09SH-3171 FIX switched texture pipeline to use the new cap request URLNyx (Neal Orman)
If we support server side texture baking, requests for baked textures will go through the http url received at login.
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 08:29:20 +0000