Mark Palange (Mani)
c51608633d
CHOP-238 Fix to bug introduced by http://hg.secondlife.com/viewer-beta/changeset/4072bd5389b2 Reviewed by Brad
2010-12-01 16:02:43 -08:00
Mark Palange (Mani)
8c2026d6b7
CHOP-135 Bug fixes.
2010-11-18 21:57:27 -08:00
Mark Palange (Mani)
e19ee531ae
merge
2010-11-18 17:03:40 -08:00
Andrew A. de Laix
cd30239eda
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
2010-11-18 15:40:36 -08:00
Mark Palange (Mani)
6802775bc4
Merge with viewer-development
2010-11-18 15:36:11 -08:00
brad kittenbrink
0e52564f0a
Fix for mac build error.
2010-11-18 15:11:42 -08:00
Andrew A. de Laix
3625a0f236
inform user on failed install--needs proper user dialog ;-)
2010-11-18 13:25:44 -08:00
brad kittenbrink
cf3ded4491
First draft of CHOP-106 downloaded update ready notification.
...
Reviewed by mani.
2010-11-18 12:15:49 -08:00
Wolfpup Lowenhar
899f470dec
STORM-102: Merge from viewer-development
2010-11-11 22:37:51 -05:00
Andrew A. de Laix
7a7f89db6d
fix termination issues with thread safe queue in main loop repeater service.
2010-11-11 11:46:24 -08:00
Mark Palange (Mani)
4151771584
CHOP-151 Hooked up app exit callback, cleaned up early exit. Rev. by Brad
2010-11-10 19:21:03 -08:00
Mark Palange (Mani)
7eed962a62
Merge
2010-11-10 14:28:54 -08:00
Mark Palange (Mani)
b2e84d739b
CHOP-151 Adding startup updater flow to drive update installation and resume.
2010-11-10 14:26:14 -08:00
Andrew A. de Laix
9ae2891a3a
start of a thread safe queue
2010-11-09 15:04:44 -08:00
Oz Linden
eea9460ba5
merge storm-102 branch back to default
2010-11-09 15:18:51 -05:00
Merov Linden
b5df1d2abc
STORM-105 : takes Vadim's comments into account, clean up use of static globals and magic strings, enforce naming conventions
2010-11-08 17:16:31 -08:00
Merov Linden
85509457c6
STORM-105 : Take Vadim code review into account, code clean up
2010-11-05 18:40:08 -07:00
brad kittenbrink
d1c365e7b7
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
2010-11-05 16:45:18 -07:00
Merov Linden
f7af29ab40
merge with viewer-development
2010-11-04 14:30:32 -07:00
Andrew A. de Laix
dfeb7abe5f
checker working with v1.0 update protocol.
2010-11-04 14:08:14 -07:00
Loren Shih
889aff8d87
automated merge from http://hg.secondlife.com/viewer-beta
2010-11-04 14:44:00 -04:00
Vadim ProductEngine
5d7417b40e
STORM-422 FIXED Added command line option "-disablecrashlogger" to disable crash logger.
...
This is a patch originally written by Robin Cornelius.
I made it work with Google Breakpad.
2010-11-02 20:26:38 +02:00
Mark Palange (Mani)
730ffc4a48
Merge
2010-11-01 15:22:02 -07:00
Mark Palange (Mani)
6ab2e44e94
VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad.
2010-11-01 15:18:18 -07:00
Andrew A. de Laix
ca9594af28
shell of the update checker; it will just print a message to the log depending on the result of the check one time.
2010-10-28 16:47:05 -07:00
Oz Linden
4fa6500b51
STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir
...
--HG--
branch : storm-102
2010-10-28 18:09:09 -04:00
Merov Linden
40979589af
STORM-105 : improve decompression perf gathering, allow perf name to be passed on the command line, fix crash in analysis phase
2010-10-27 23:15:22 -07:00
Mark Palange (Mani)
be8c9fc217
CHOP-122 Initializing Facade service in the viewer. Rev. by Brad.
2010-10-27 17:07:31 -07:00
Merov Linden
a0714f0180
Merge with viewer-development
2010-10-22 17:39:03 -07:00
Loren Shih
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
Vadim ProductEngine
b3f3fb6099
STORM-417 FIXED Port of SNOW-140 to SG 2.0 : Forced updates not working on Mac
...
The point of this patch is to make the Mac updater code a bit more flexible
and reliable than it is right now. The issue is double:
* reliability: the string comparison code on the bundle identifier is not UTF8 compliant
* flexibility: the bundle identifier is hard coded to match the bundle identifier of LL viewer
(i.e. com.secondlife.indra.viewer) so it can't work for another viewer
(in particular, it didn't work for Snowglobe).
The "bundle identifier" is one of those Mac only thing stored in the Info.plist of a "bundle"
(the ".app" folder that's bundling an executable and all its resources and is seen
as an application when browsing with the Mac OS X Finder).
The patch fixes both issues:
* compare correctly UTF8 encoded strings
* allow the bundle ID to be passed as a parameter to the updater
The patch has really no consequence on LL viewer. It's more a matter of having cleaner, better code.
Author: Cypren Christenson
Ported and reviewed by: Merov Linden
2010-10-20 21:23:27 +03:00
Xiaohong Bao
219cd6ecda
more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.
2010-10-14 21:23:23 -06:00
Xiaohong Bao
5ee546eb4e
for SH-335: create a debug tool to track of memory availability.
2010-10-14 17:01:39 -06:00
Merov Linden
e3ecffc180
Pull update from viewer-development
2010-10-12 16:08:31 -07:00
Leyla Farazha
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
Merov Linden
8ada6ed3cf
Pull update from viewer-development
2010-09-16 20:09:36 -07:00
Leyla Farazha
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
Andrew Dyukov
f0ba3d35b2
STORM-107 FIXED Fixed Polish character corruption in date.
...
Added polish language to list of languages that use months and days names from localized xmls.
It solved the problem of accented Polish characters "approximation" to their ASCII brethren on non-Polish Windows locales. Now all accented symbols look right.
2010-09-16 20:58:02 +03:00
Merov Linden
39e5d2ecf0
VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non complete) implementation in llimagej2c
2010-09-08 23:03:56 -07:00
Aimee Linden
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Xiaohong Bao
e29f811d56
code for DEV-52939: viewer's object geometry cache files are not limited in number, and can also be incorrectly cleared with the VFS cache.
...
reviewed by andrew.
2010-09-01 13:40:10 -06:00
Richard Linden
949b604655
Backed out changeset: d71309f8bd0e
2010-09-17 15:01:44 -07:00
Richard Linden
83bb4b9518
fixed merge
2010-09-16 22:10:30 -07:00
Richard Linden
1911993cc7
merge
2010-09-16 19:45:57 -07:00
Monroe Linden
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
Richard Linden
093e83386d
merge
2010-08-26 12:49:00 -07:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00