summaryrefslogtreecommitdiff
path: root/indra
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-19fix for SH-3238: Textures are loaded at lower detail on subsequent log-insXiaohong Bao
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color ↵Dave Parks
values change.
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
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-09merge changes for DRTVWR-177Oz Linden
2012-07-08merge changes for 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-29merge changes for DRTVWR-174Oz Linden
2012-06-29Merge with viewer-betacallum
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-22Merge cleanupDave Parks
2012-06-22mergeDave Parks
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-21merge changes for DRTVWR-171Oz Linden
2012-06-20STORM-1889: require all fields when importing spelling dictionaryOz Linden
2012-06-20MAINT-1150 FIX (Speculative) crash on (shutdown) in LLVOAvatar::avString()callum
Reviewed by vir
2012-06-19STORM-1887 FIXED Added words are not saved in dictionaries if main ↵Kitty Barnett
dictionary was reselected The user's custom dictionary and ignore list are now independent of the primary dictionary.
2012-06-15corrected build problem detected on MacOz Linden
2012-06-15STORM-276 Ease-of-use importing of Open Office dictionary extensionsKitty Barnett
2012-06-15STORM-1883: add alert when a secondary dictionary is importedOz Linden
2012-06-15STORM-276 FIXED Main dictionary combobox in spell check settings floater ↵Kitty Barnett
doesn't sort dictionaries by name
2012-06-15minor cosmetic changes to spelling floaterOz Linden
2012-06-14STORM-1880: copy imported dictionary files rather than moving themOz Linden
2012-06-14STORM-1881: close dictionary import dialog if parent spell checking prefs ↵Oz Linden
dialog is closed
2012-06-14STORM-1882: keep dictionary selected when moving, allowing deletion when ↵Oz Linden
moved to Available
2012-06-14EXP-1953: Updating the response message sent to the Inviter in Scenario 3.Todd Stinson
2012-06-14fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between ↵Xiaohong Bao
sessions
2012-06-13EXP-1959: Marking the teleport entry access notifications as unique so they ↵Todd Stinson
do not stack.
2012-06-12EXP-1941: Backed out changeset: 2f6546ac7e5eTodd Stinson
2012-06-12EXP-1953: Updating copy after Leo creating the final copy in the jira.Todd Stinson
2012-06-12EXP-1953: Altering the behavior of building an LLTextBase such that icons ↵Todd Stinson
are appended in place rather than prepended out of context.
2012-06-12for SH-3073: implement a fast cache system for texture fetchingXiaohong Bao
2012-06-12minor ui tweaks from reviewOz Linden
2012-06-11merge spelling changes for UI reviewOz Linden
2012-06-11merge fixes for http testsOz Linden