summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-21merge changes for chop-948Oz Linden
2013-05-21NORSPEC-196: fix frame stalls caused by FmodEx loggingcallum_linden
2013-05-21more merge fixingBrad Payne (Vir Linden)
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-21revise test for hg to detect and ignore incorrect results from cygwin hgOz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-21CHOP-948: correctly persist the UpdaterWillingToTest preferenceOz Linden
2013-05-20SH-4200 FIX - retry ais ops on 5xx errors, dialed back some verbose logging.Brad Payne (Vir Linden)
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden
2013-05-17SH-4200 WIP - added AISCommand classes with retry capabilities.Brad Payne (Vir Linden)
2013-05-17mergeBrad Payne (Vir Linden)
2013-05-16SH-4168 FIX Inventory: Loading... Loading... shown on foldersRichard Linden
cleaned up logic for displaying "loading..." message so that it only applies to folders that are opened whose contents aren't yet loaded
2013-05-16SH-4175 WIP - removed a case where we request to delete the base outfit link ↵Brad Payne (Vir Linden)
twice when changing outfits
2013-05-15SH-4175 WIP - Avoid add to outfit or remove from outfit when an outfit ↵Brad Payne (Vir Linden)
change is already in progress
2013-05-15MAINT-2665: fix crashes being counted as wrong type in last_exec_event due ↵Oz Linden
to log macro wrapper
2013-05-15SH-4197 FIX - also simplified the category remove flow for AIS, don't need ↵Brad Payne (Vir Linden)
to purge descendents first.
2013-05-15SH-4144 FIX - removed UseAISv3Inventory debug settings - cap is now managed ↵Brad Payne (Vir Linden)
sim-side
2013-05-14mergeBrad Payne (Vir Linden)
2013-05-13SH-4168 WIP, SH-4155 WIP - update inventory model based on ais returns, try ↵Brad Payne (Vir Linden)
to maintain loading... string more consistently in folder bridge
2013-05-13SH-4035: Removed prompt to save if av just has outfit changes and you click ↵prep@lindenlab.com
on the back button
2013-05-13CHOP-942: fix crash if update check times outOz Linden
2013-05-13SH-4035: Hooked up logic to handle 'me->appearance'. Refactored out some ↵prep@lindenlab.com
commonly used code in llfloatersidepanelcontainer
2013-05-13mergeBrad Payne (Vir Linden)
2013-05-10mergeprep@lindenlab.com
2013-05-10SH-4035: Removed prompt to save if av just has outfit changes. Hooked up ↵prep@lindenlab.com
logic to handle ctrl+w and ctrl+shift+w confirmation prompts
2013-05-10BUILDFIX capitalization errorNyx Linden
2013-05-10mergeNyx Linden
2013-05-10DEBUG adding additional logging for avatar heightNyx Linden
usually disabled, enable avatar in logcontrol.xml to get output.
2013-05-10SH-4176 WIP - allow retries on 4xx errors if enabled by flag. So enable in ↵Brad Payne (Vir Linden)
the case of appearance requests.
2013-05-10SH-4176 WIP - avoid raw dump of whole error contents in log fileBrad Payne (Vir Linden)
2013-05-10SH-4176 WIP - tweaks to debugCOF(), which shows differences between viewer ↵Brad Payne (Vir Linden)
and server side views of the COF when a mismatch occurs
2013-05-09SH-4176 WIP - made debugCOF() slightly harder to get to.Brad Payne (Vir Linden)
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09mergeBrad Payne (Vir Linden)
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
made marker file lock use append, not truncate
2013-05-09SH-4168 WIP - fixed some bugs in inventory deletion and lost-and-found handling.Brad Payne (Vir Linden)
2013-05-08mergeNyx Linden
2013-05-08SH-4048 SH-4171 SH-4046 FIX avatar sinks into ground, updates sent to observersNyx Linden
Avatar preview code was triggering avatar size updates, which were causing the avatar's height above the ground to change when the previews were rendered. Also added code to suppress appearance updates being sent out while in appearance editing mode.
2013-05-07SH-4154 FIX - added a few more validity checks. Disabled by default so users ↵Brad Payne (Vir Linden)
won't have logs spammed.
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-07merge changes for DRTVWR-315Oz Linden
2013-05-06SH-4147 FIX macro avatars with low hover look wrong after relogNyx Linden
Preventing hover limit from being applied during startup or shutdown when the rigged mesh may not be fully loaded.
2013-05-06MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()callum_linden
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
* Fix mute button.
2013-05-03mergeKelly Washington
2013-05-03SH-4147 FIX Macro avatars with hover==0 look incorrect on relogNyx Linden
Inverted logic meant that we would enforce minimums only while in preview renders, not for actual user adjustments. This seems to fix it.
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Switch mute to use task id. reviewed with Simon
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
2013-05-02mergeNyx Linden
2013-05-02SH-4060 FIX avatar hover being set to minimum at seemingly random timesNyx Linden
avatar hover was being temporarily set to -2.0 for the preview render, which was triggering the minimum enforcement, even when the user's requested value is no where near the minimum. Added a flag to disable the minimum enforcement if we are temporarily changing the value.