5743a0b00d
Skin+Theme Selector, thanks to Kitty Barnett / Catznip, along with example starlight themes
2011-01-06 01:17:44 -05:00
499861222c
Branding tweaks - Firestorm -> Phoenix Firestorm in window title, installers
2010-12-29 10:52:49 -05:00
c42771d92b
Window title now include full channel + version
2010-12-05 17:24:58 -05:00
6345866831
More branding / URL adjustments
2010-11-21 13:06:33 -05:00
bb04abd971
RLVa mergeup
2010-11-17 06:19:05 -08:00
899f470dec
STORM-102: Merge from viewer-development
2010-11-11 22:37:51 -05:00
eea9460ba5
merge storm-102 branch back to default
2010-11-09 15:18:51 -05:00
425e003b7d
sync from lgpl
2010-11-09 10:21:07 -08:00
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
85509457c6
STORM-105 : Take Vadim code review into account, code clean up
2010-11-05 18:40:08 -07:00
829b22b1e4
Merge from LL
2010-11-05 12:17:05 -07:00
9d8441907c
sync up to display names from -int
2010-11-04 21:44:28 -04:00
f7af29ab40
merge with viewer-development
2010-11-04 14:30:32 -07:00
889aff8d87
automated merge from http://hg.secondlife.com/viewer-beta
2010-11-04 14:44:00 -04:00
a447abda77
Merging up to LL #head
2010-11-04 10:11:02 -07:00
b96b8e3ca0
Merge with RLva-#head
2010-11-04 10:09:29 -07:00
d0d3e716dc
Rolling back before back RLV merge
2010-11-04 10:02:01 -07:00
cc718fcdf2
Snowstorm syncup
2010-11-03 22:44:26 -07:00
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
2e01e8344c
merged in from firestorm-int
2010-10-31 21:21:40 -04:00
ace393f4c8
Setting win32 WINDOW_CLASSNAME back to play nice with other viewers
2010-10-31 21:13:50 -04:00
8fcb69d0c3
Integration of RLVa, pre-display names.
...
HUDtext updates may be broken, much testing needed.
I expect this merge to be improved and even fully replaced by up and coming RLVa work.
When we do get a clean merge of RLVa, it should stay clean.
It does compile ;)
2010-10-31 20:47:18 -04:00
9498c31d3c
Merged with default tip (Revision aeb7e6c38341)
...
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
4fa6500b51
STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir
...
--HG--
branch : storm-102
2010-10-28 18:09:09 -04:00
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
a0714f0180
Merge with viewer-development
2010-10-22 17:39:03 -07:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
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
68a7f429cf
Branding window bars
2010-10-20 10:05:41 -04:00
219cd6ecda
more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.
2010-10-14 21:23:23 -06:00
5ee546eb4e
for SH-335: create a debug tool to track of memory availability.
2010-10-14 17:01:39 -06:00
e3ecffc180
Pull update from viewer-development
2010-10-12 16:08:31 -07:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
c434dcafb2
Merged with branch point for SL-2.2.0 (Revision dc8ac597008a)
...
--HG--
branch : RLVa
2010-09-22 21:01:32 +02:00
8ada6ed3cf
Pull update from viewer-development
2010-09-16 20:09:36 -07:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
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
f7ff27e313
Merged with default tip (Revision b8cd74d2bcc8)
...
--HG--
branch : RLVa
2010-09-15 23:22:10 +02:00
39e5d2ecf0
VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non complete) implementation in llimagej2c
2010-09-08 23:03:56 -07:00
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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
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
949b604655
Backed out changeset: d71309f8bd0e
2010-09-17 15:01:44 -07:00
83bb4b9518
fixed merge
2010-09-16 22:10:30 -07:00
1911993cc7
merge
2010-09-16 19:45:57 -07:00
e6e551cb41
Merged with default tip (Revision 7a739cbdce56)
...
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
093e83386d
merge
2010-08-26 12:49:00 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Arrehn