Nat Goodspeed
a55f88109f
MAINT-3489: Gracefully handle missing downloaded installer file.
...
If a marker file indicates that an installer has been downloaded and verified
and is ready to install, but that installer file does not exist, log it and
revert to checking for update.
Also add logging to every code path that can remove the installer explicitly,
in case the missing installer is actually being killed off by some weird
sequence of state-machine transitions.
2013-11-26 17:18:28 -05:00
Oz Linden
fe3a930623
merge fix for STORM-1984
2013-11-26 16:09:43 -05:00
Oz Linden
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
Merov Linden
f0cbf849ac
ACME-3320 : Clearing deleted categories so not to pool on them forever
2013-11-26 12:04:01 -08:00
Jonathan Yap
44ea72848f
STORM-1981 Eliminate beam spreading
2013-11-26 09:30:53 -05:00
Nat Goodspeed
9e986201ba
MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.
...
Also, delete it when done.
2013-11-26 09:25:10 -05:00
Cho
bf86275d78
LLTwitterConnect and LLFlickrConnect now use caps again, instead of pdp15
2013-11-26 01:47:37 +00:00
Merov Linden
2776f8ac48
MAINT-3320 : Make inbox (Received Items) more resilients to deletion while we're at it
2013-11-25 17:19:48 -08:00
Brad Payne (Vir Linden)
c0d780cb44
SH-4613 WIP - add CREATE mask bit for newly created items in AISUpdate::doUpdate() - needed for some inventory observers.
2013-11-25 16:52:58 -05:00
Brad Payne (Vir Linden)
fd2d812236
SH-4549 FIX - code cleanup
2013-11-25 16:03:52 -05:00
Oz Linden
6c44fe90f2
remove obsolete INSTFLAGS references from installer
2013-11-25 15:52:59 -05:00
simon
97b932c405
Merge last changes for DRTVWR-345
2013-11-25 11:12:57 -08:00
Jonathan Yap
f04c2a781c
STORM-1981 Make pulse operate properly in both directions.
...
Move duplicated common code into its own function.
2013-11-25 13:54:43 -05:00
MaximB ProductEngine
e28bd4612e
merge
2013-11-25 20:07:28 +02:00
maksymsproductengine
bae67dee23
MAINT-3499 FIXED Region Debug Console is broken after resize
2013-11-25 19:37:57 +02:00
Monty Brandenberg
fc4f6e2dac
Merge. Refresh from viewer-release after 3.6.11 release.
2013-11-25 12:32:21 -05:00
simon
5756b7b3d0
Merge - doh!
2013-11-25 09:17:29 -08:00
Jonathan Yap
6b1d835f95
STORM-1981 Rough initial changes for evaluation purposes.
2013-11-24 15:46:21 -05:00
Oz Linden
79919ef9b6
move setting default grid to settings_install.xml so that it works on all platforms
2013-11-24 13:18:12 -05:00
Oz Linden
6d6b0edfe2
normalize format of and add arch to all installer names
2013-11-24 13:16:36 -05:00
Brad Payne (Vir Linden)
8f4c4db90f
SH-4611 FIX - use an observer to scroll after category rename completes
2013-11-23 09:37:09 -05:00
Xiaohong Bao
04aece3282
fix for SH-4635: Interesting: Some objects do not load on the second visit
2013-11-22 20:55:57 -07:00
Xiaohong Bao
0954d4f5d5
fix for SH-4632: Water over land doesn't render when teleporting to the same place twice with location toolbar
2013-11-22 15:46:50 -07:00
merov
c16de4df18
ACME-1219 : Fix crash on exit on Windows 7
2013-11-22 20:16:03 +00:00
simon
f1be57cd30
Merge server-release
2013-11-22 10:39:03 -08:00
maksymsproductengine
2c5e306e14
MAINT-3474 FIXED crash on startup in LLTextureCache::purgeAllTextures(bool) attempting to delete texture cache
2013-11-22 20:16:37 +02:00
Ima Mechanique
7563fb0b51
storm-1831 Replacing old hack with an ENUM check.
2013-11-22 01:01:29 +00:00
Xiaohong Bao
fbd0d85e54
fix for SH-4633: Idle avatars intermittently vanish from the scene after camming away, and returning to a location.
2013-11-21 17:35:41 -07:00
Xiaohong Bao
f89b5d2f74
combine the visiblities of octree group and object cache entry for visiblity check
2013-11-21 17:34:27 -07:00
Xiaohong Bao
24a6396cd7
fix a mouse hovering crash.
2013-11-21 16:44:07 -07:00
Merov Linden
6d24bb6eab
Pull merge from lindenlab/viewer-release
2013-11-21 15:26:51 -08:00
Xiaohong Bao
dbfb429bd1
fix for SH-4628: Project Interesting Viewer reduces & fixes graphics to lowest settings on a MAC
2013-11-21 15:32:57 -07:00
Ima Mechanique
380334956c
storm-1831 Fixing message string UUID assignment
2013-11-21 21:29:24 +00:00
Oz Linden
915ade1029
merge changes for 3.6.11-release
2013-11-21 15:35:25 -05:00
Ima Mechanique
fa5c3320cc
storm-1831 Cleaning up colour LLSD processing code which is no longer used as colours come from the colors XML file.
2013-11-21 19:55:38 +00:00
Ima Mechanique
b5eb40cfd4
storm-1831 Cleaning up output messages SyntaxLSL.
2013-11-21 19:28:35 +00:00
Oz Linden
45bc601563
merge changes for 3.6.11-release
2013-11-21 14:08:38 -05:00
Oz Linden
787ccaf297
increment viewer version to 3.6.12
2013-11-21 14:05:30 -05:00
Oz Linden
bcf2611279
Added tag 3.6.11-release for changeset 2feb70a4cfde
2013-11-21 14:05:28 -05:00
Xiaohong Bao
fb29358d70
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-11-21 11:21:09 -07:00
Xiaohong Bao
c14ecc8178
fix for SH-4629: Interesting: crash at LLViewerRegion::killObject
2013-11-21 11:20:45 -07:00
Oz Linden
4f2a7167b6
merge changes for open-196
2013-11-21 11:29:28 -05:00
Mnikolenko ProductEngine
1ae4d45337
MAINT-3480 FIXED Duplicated strings are deleted
2013-11-21 15:51:37 +02:00
Mnikolenko ProductEngine
54f29d25a9
MAINT-3471 FIXED Set USER_LOCALE when updating item count.
2013-11-21 12:37:26 +02:00
Ima Mechanique
483c829aa3
storm-1831 Removing am uneccessary message.
2013-11-21 02:37:40 +00:00
Richard Linden
3d35f00d63
BUILDFIX: forgot template parameter
2013-11-20 18:16:54 -08:00
Richard Linden
7a91ec40aa
SH-4626 FIX: [INTERESTING RC] Viewer randomly crashes when I click on links in IMs or group IMs
2013-11-20 16:21:03 -08:00
niel@mint-32
25c7ea0532
storm-1831 Replacing old region changed callback setup with the shiny new one.
2013-11-21 00:02:15 +00:00
niel@mint-32
7e749052ca
storm-1831 Expanding/fixing copyright header
2013-11-20 23:59:37 +00:00
niel@mint-32
afcd1f9296
Merge
2013-11-20 23:48:59 +00:00