summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-29SH3530: Removed extra ServerAppearanceUpdate()prep@lindenlab.com
2013-01-28mergeBrad Payne (Vir Linden)
2013-01-28SH-3779 WIP, SH-3534 WIP - more bake-status trackingBrad Payne (Vir Linden)
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate entry from panel_preferences_general.xml
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-29MAINT-2281: correct test for XPcallum_linden
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-25BUILDFIX: merge cleanupNyx Linden
A couple of merge issues that caused the resulting code to not build.
2013-01-25merge changes for DRTVWR-290Oz Linden
2013-01-25SH-3779 WIP - less verbose appearance dumps, keep appearance version visual ↵Brad Payne (Vir Linden)
param in sync with mUseServerBakes
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24SH-3779 WIP - handling of appearance version paramBrad Payne (Vir Linden)
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.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-24MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after ↵Kelly Washington
selecting the other parcel * Removed bogus check on matching parcel data coming in.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-23SH-3779 WIP - fully parse appearance message before trying to do anything ↵Brad Payne (Vir Linden)
with it
2013-01-23SH-3534 WIP - better encapsulation of mUseServerBakesBrad Payne (Vir Linden)
2013-01-23fixes and updates to DebugAvatarAppearanceMessage status lineBrad Payne (Vir Linden)
2013-01-22Added cof version information to DebugAvatarAppearanceMessage outputBrad Payne (Vir Linden)
2013-01-22merge changes for DRTVWR-287Oz Linden
2013-01-22Add debug level logging for Avatar by default. Will need to turn this off ↵Brad Payne (Vir Linden)
before general release, but will give us better debugging info during testing
2013-01-18SH-3344 WIP - more texture load monitoringBrad Payne (Vir Linden)
2013-01-16MAINT-2247 Child object does not update rotation while selected.Kelly Washington
2013-01-16MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.Dave Parks
2013-01-16mergeBrad Payne (Vir Linden)
2013-01-16SH-3645 WIP - preserve item order after wearable save asBrad Payne (Vir Linden)
2013-01-15SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an ↵Brad Payne (Vir Linden)
obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2013-01-14SH-3632:Undo change is now disabled after you save and return to the edit ↵prep
out fit panel (this behavior is now make sunshine-internal consistent with 3.4.1)
2013-01-14removed yet another logcontrol.xml commitBrad Payne (Vir Linden)
2013-01-14merge changes for DRTVWR-283Oz Linden
2013-01-11merge changes for DRTVWR-281Oz Linden
2013-01-11fix line endingscallum_linden
2013-01-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-11MAINT-1481: use 'mktemp -d' to generate tempdir.Nat Goodspeed
Responding to Lex's code-review comments.
2013-01-11MAINT-1481: Clean up update_install UI, including error output.Nat Goodspeed
Capture actual error output from mkdir and mv; display it to user. Introduce mysudo function used by sudo_mv function for graphical sudo command. Since update_install actually only displays a single status message, just use zenity --info instead of a zenity progress box: need not update its message. Borrow semantics for clear_message and status functions from xmenity script. Introduce errorbox function so we only have to make zenity/xmessage test once. Move cleanup, onexit to top so we can use for clear_message.
2013-01-11MAINT-1481: Remove xmenity script and viewer_manifest.py references.Nat Goodspeed
2013-01-11SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. ↵Brad Payne (Vir Linden)
Disabled inventory retries for now.
2013-01-11mergeBrad Payne (Vir Linden)
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10mergeBrad Payne (Vir Linden)
2013-01-10SH-3639 WIP - increased retry interval to allow for intermittent extremely ↵Brad Payne (Vir Linden)
slow responses
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10SH-3142: Added a debug option that circumvents the precache delay when ↵prep
teleporting.
2013-01-10MAINT-1481: minor bug fix plus incomplete UI tweaks.Nat Goodspeed
Test for existence of target name using -e rather than -f. (-d would work too, but in this case we must respond to any name collision, whether file or directory.) Instead of terminating on failure, make sudo_mv return rc of the [sudo] mv command to its caller. If the attempt to move new install to actual viewer directory fails, restore previous viewer before failing. When redirecting the script's stderr to updater.log, first save existing stderr to another file descriptor, and restore it when we launch viewer. Otherwise updater.log ends up collecting the viewer's duplicate stderr log output! The construct 'exec ... | program' doesn't work. In fact it causes any other redirections on that command to fail too. Remove it -- real fix pending.
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09SH-3600. Undo change is disabled upon reentry into the appearance panelprep