summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30line munging for merge warn-on-failure:unix-eolBrad Payne (Vir Linden)
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-23Added tag 3.3.4-release for changeset 28e100d0379aOz Linden
2012-07-19fix for SH-3238: Textures are loaded at lower detail on subsequent log-insXiaohong Bao
2012-07-18Added tag 3.3.4-beta5 for changeset ab2ffc547c8aOz Linden
2012-07-18merge changes for DRTVWR-184Oz Linden
2012-07-18tag merge of DRTVWR-184Oz Linden
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color ↵Dave Parks
values change.
2012-07-17Added tag 3.3.4-beta4 for changeset 6c75f220b103Oz Linden
2012-07-17merge changes for DRTVWR-183Oz Linden
2012-07-17tag merge of DRTVWR-183Oz Linden
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-14tag merge of DRTVWR-180Oz Linden
2012-07-13fix for SH-3235: Bump maps are not loaded until objects change LODXiaohong Bao
2012-07-12fix for SH-3237: cached sculpties do not load at the correct LOD.Xiaohong Bao
2012-07-12MAINT-1262 Fix for crash when setting graphics to LowDave Parks
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-09Added tag 3.3.4-beta3 for changeset a8057e1b9a12Oz Linden
2012-07-09merge changes for DRTVWR-177Oz Linden
2012-07-09tag merge of DRTVWR-177Oz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-08tag merge of DRTVWR-176Oz Linden
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
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
2012-06-30Added tag 3.3.4-beta2 for changeset 82b5330bc8b1Oz Linden
2012-06-29merge changes for DRTVWR-174Oz Linden
2012-06-29tag merge of DRTVWR-174Oz Linden
2012-06-29merge changes for DRTVWR-173Oz Linden
2012-06-29tag merge of DRTVWR-173Oz Linden
2012-06-29Merge with viewer-betacallum
2012-06-28Added tag 3.3.4-beta1 for changeset f91d003091a6Oz Linden
2012-06-27MAINT-1204 Fix for crash on selecting a texture anywhere other than the ↵Dave Parks
build tools.
2012-06-27Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078Kelly Washington
2012-06-27MAINT-1078 Merchant Outbox import failuresKelly Washington
Add 1s throttle on update checks for importer reviewed with Simon
2012-06-26fix merge conflicts: v-r to dranoXiaohong Bao
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-25correct linux packaging for hunspell libraryOz Linden
2012-06-25Added tag 3.3.4-beta1, DRTVWR-158 for changeset f87bfbe0b62dOz Linden
2012-06-25tag merge of DRTVWR-170Oz Linden
2012-06-22Merge cleanupDave Parks
2012-06-22mergeDave Parks
2012-06-21merge back 3.3.3-release tagOz Linden
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-21tag merge of DRTVWR-168Oz Linden
2012-06-21Added tag 3.3.3-release for changeset 6428242e124bOz Linden
2012-06-21merge changes for DRTVWR-171Oz Linden