Oz Linden
f633aef1af
Automated merge with file:///Users/oz/Work/V-D
2011-03-29 19:32:41 -04:00
Oz Linden
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
Oz Linden
7cb4f2d87d
merge changes for storm-1086
2011-03-29 19:21:41 -04:00
Oz Linden
9c0757511e
merge changes for storm-1077
2011-03-29 19:19:24 -04:00
Oz Linden
6faf2f8ee1
pull back beta changes to viewer-development
2011-03-29 19:17:29 -04:00
Oz Linden
483b7b6745
pull back beta changes to viewer-development
2011-03-29 19:17:22 -04:00
eli_linden
6418ccc9e5
INTL-34 WIP Set22 translations DE ES
2011-03-29 16:09:32 -07:00
eli_linden
8c449f4542
VWR-24128 FIX ES
2011-03-29 14:53:23 -07:00
eli_linden
75fb588e94
VWR-24907 FIX ES translation
2011-03-29 14:49:20 -07:00
eli_linden
cad1136d2f
VWR-24908 WIP shorten ES translation but may still require resizing
2011-03-29 14:43:13 -07:00
eli_linden
ec96acc629
STORM-1119 WIP shorten ES translation
2011-03-29 14:34:59 -07:00
eli_linden
ba1a9204f8
VWR-24911 FIX
2011-03-29 14:07:22 -07:00
Oz Linden
810a14c18f
merge changes for storm-1097
2011-03-29 16:00:39 -04:00
Dessie Linden
2c5b7cf2f7
Added tag DRTVWR-39_2.6.0-release, 2.6.0-release for changeset 42f32494bac4
2011-03-29 11:37:09 -07:00
eli_linden
6b188b691b
INTL-34 WIP Set22 translations FR
2011-03-29 11:15:04 -07:00
Paul ProductEngine
e0ca936fbf
STORM-1072 FIXED [TRANSLATED BUT IN EN] in "Monde" > "Profil du lieu" > "À propos des terrains" > "Réglement" : "Estate / Full Region" is in english.
...
- Linked region_type string value with translation in strings.xml. If translation for region_type string is absent set unlocalized version (not MissingString text as usual)
2011-03-29 13:57:24 +03:00
Oz Linden
83cff21cfe
merge openal linking fixes
2011-03-29 06:46:00 -04:00
Richard Linden
84b179b0bf
Automated merge with file:///F:\code\viewer-autobuild2010
2011-03-28 17:38:54 -07:00
Andrew de Laix
8e42c0e0a7
get naming of openallib right when packaging.
2011-03-28 22:51:45 +00:00
Andrew de Laix
1a49226a89
well, that didn't work. Rollback..
2011-03-28 22:49:53 +00:00
Richard Linden
d597efc0f3
fix for mac/linux?
2011-03-28 15:35:48 -07:00
Andrew A. de Laix
77e4288696
Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010
2011-03-28 14:00:48 -07:00
Andrew A. de Laix
d20f8a07cc
fix CHOP-402: use newer api call for move to trash that will rename if needed.
2011-03-28 14:00:35 -07:00
Richard Linden
331a419a69
SOCIAL-821 FIX Move hint comes up immediately when launching viewer
2011-03-28 13:46:36 -07:00
Richard Linden
1733929aaf
SOCIAL-823 FIX Performing click to walk or click to drag actions do not remove move hint in Basic mode
2011-03-28 13:44:52 -07:00
alain@945battery-guestA-183.lindenlab.com
d97d1326c2
merge
2011-03-28 13:34:44 -07:00
alain@945battery-guestA-183.lindenlab.com
7564583238
fix openal linking of viewer.
2011-03-28 13:34:06 -07:00
Richard Linden
f2892c9882
fix for linux and mac
2011-03-28 11:48:43 -07:00
Eli Linden
b9d92585f8
catchup with viewer-development
2011-03-28 11:42:18 -07:00
eli_linden
7a34a037b9
SOCIAL-703 FIX fix name attribute for translated files
2011-03-28 11:36:37 -07:00
Oz Linden
3d5a8cc2e3
merge late fix for SOCIAL-778 into 2.6.1 for release
2011-03-28 11:32:05 -04:00
Dessie Linden
a7b83e04eb
merged pre-beta and development versions of .hgtags
2011-03-28 06:10:47 -07:00
Oz Linden
77cd2e283a
merge up from viewer-autobuild2010 through the start of 2.6.3
2011-03-28 09:06:51 -04:00
Oz Linden
18e7881ee8
merge up from viewer-development through the start of 2.6.3
2011-03-28 09:01:54 -04:00
Dessie Linden
7617868658
Added tag DRTVWR-43_2.6.1-beta1, 2.6.1-beta1 for changeset c5bdef3aaa27
2011-03-28 05:58:57 -07:00
Oz Linden
68a7f7c241
increment viewer version to 2.6.3
2011-03-28 08:56:07 -04:00
Oz Linden
44ec69afab
Added tag 2.6.2-start for changeset 56b2778c743c
2011-03-28 08:55:04 -04:00
Oz Linden
af3f0f49d7
merge changes for storm-987
2011-03-27 21:45:43 -04:00
Oz Linden
d6da299f43
pull in latest changes from autoubuild2010 branch
2011-03-27 06:43:54 -04:00
Oz Linden
5b316df224
merge out latest changes from viewer-development
2011-03-27 06:39:42 -04:00
Richard Linden
03aef8f20c
merge
2011-03-25 19:15:11 -07:00
Richard Linden
f443f3e847
SOCIAL-717 FIX Artwork for click to move hint
...
updated resize logic for hint popups to accomodate image size
2011-03-25 19:13:32 -07:00
Merov Linden
29bcedaf02
STORM-987 : Fix the creation of images in local dir
2011-03-25 17:18:28 -07:00
Merov Linden
b7b9a37bc1
STORM-1021 : pull into viewer-development
2011-03-25 16:43:49 -07:00
Merov Linden
fbb280d84e
STORM-1030 : pull into viewer-development
2011-03-25 16:41:36 -07:00
Merov Linden
136e294c4c
STORM-36 : pull into viewer-development
2011-03-25 16:39:36 -07:00
Richard Linden
d01afc8a6a
SOCIAL-751 FIX Don't Quit button on 'Changing modes...' dialog gives the false impression that it does nothing
...
combo box now changes back to previous label when selecting don't quit
2011-03-25 16:24:56 -07:00
Jonathan Yap
567035a2f7
STORM-1094 Chat preferences > font size should increase size of input text in IM window
2011-03-25 17:58:20 -04:00
Jonathan Yap
c4ec708922
STORM-1108 Merge with updated v-d
2011-03-25 17:18:26 -04:00
Jonathan Yap
c7cacf7d67
STORM-1108 Enable Hints menu entry/preference is confusing
2011-03-25 17:17:05 -04:00