Don Kjer
4f02059601
Merge viewer-horde-fixes -> sunshine
2012-08-02 23:01:32 +00:00
Brad Payne (Vir Linden)
3a954ddda3
merge
2012-08-02 18:58:39 -04:00
Brad Payne (Vir Linden)
3b9f2925c8
merge
2012-08-02 18:57:49 -04:00
Don Kjer
dfce4c451c
Added AppearanceData block to AvatarAppearance message
2012-08-02 22:54:01 +00:00
Don Kjer
5e8b525670
Merge viewer-development -> viewer-horde-fixes
2012-08-02 22:49:32 +00:00
Nat Goodspeed
df767cef78
Manual cleanup from merge up to viewer-development.
...
Some viewer-development code had been moved, and so wasn't patched with my
panel_login layout changes; verified each of my llpanellogin.cpp commits
against new tip rev. Reformatted panel_login.xml in the spirit of the
preferred indentation scheme but with my layout changes.
2012-08-02 16:04:39 -04:00
Nat Goodspeed
f1ff284569
Automated merge with http://hg.secondlife.com/viewer-development
2012-08-02 13:23:46 -04:00
Oz Linden
7fa426f4db
tag merge of DRTVWR-186
2012-08-02 13:09:39 -04:00
Brad Payne (Vir Linden)
bf6bbe4642
MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-08-02 11:45:38 -04:00
David Kaprielian
4ed9dfd47b
Fixing up the string in the code sign flag.
2012-08-01 16:25:56 -07:00
eli
f7861f2828
FIX INTL-100 Frrench linguistic fixes
2012-08-01 16:21:58 -07:00
eli
46f10dccb6
sync with viewer-dev for 'fr'
2012-08-01 13:40:39 -07:00
eli
4376848e15
sync with viewer-dev for 'ja'
2012-08-01 13:38:21 -07:00
eli
634756de49
sync with viewer-dev for changes and new files for 'en'
2012-08-01 13:23:10 -07:00
eli
429726a1dd
sync with viewer-dev, removing obsolete files
2012-08-01 13:20:43 -07:00
simon@Simon-PC.lindenlab.com
92a0db2a4f
Merge MAINT-1270 fix
2012-08-01 13:17:35 -07:00
David Kaprielian
27d5547478
Added necessary signing information to autobuild.xml
2012-08-01 12:56:51 -07:00
Aura Linden
784d75fb65
Merged in viewer-release
2012-07-31 17:28:58 -07:00
Aura Linden
1d950fad52
For mac, viewers on 10.5 will pull mac_legacy rather than mac
2012-07-31 17:14:37 -07:00
simon@Simon-PC.lindenlab.com
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
prep@lindenlab.com
575a04b4b4
Path-643. Once the preferences panel is closed (either through ok or cancel), the pathing console rebuilds the gfx data.
2012-07-31 16:43:11 -05:00
Oz Linden
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
Brad Payne (Vir Linden)
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
Brad Payne (Vir Linden)
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden)
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
Brad Payne (Vir Linden)
0f3c5e6458
line munging for merge warn-on-failure:unix-eol
2012-07-30 14:54:44 -04:00
Nat Goodspeed
e4dadaf205
Automated merge with http://hg.secondlife.com/viewer-development
2012-07-28 09:52:11 -04:00
Nat Goodspeed
f37d109e25
Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175
2012-07-28 09:48:18 -04:00
eli
123cc80411
sync with viewer-release
2012-07-27 19:48:40 -07:00
Richard Linden
fd7bfb03c9
MAINT-1175 FIX Severe performance issues on 3.3.2 (258114) Release and 3.3.3 (259197) Beta in "Add scroll list item"
...
removed linear scan for namelist items and used weak reference (LLHandle) instead
2012-07-27 15:18:29 -07:00
Oz Linden
b8bac66a0f
increment version to 3.4.1
2012-07-27 16:22:33 -04:00
Oz Linden
1869a399be
Added tag 3.4.0-beta1 for changeset 1f27cdfdc542
2012-07-27 14:58:38 -04:00
Don Kjer
bd1b664d45
Merge viewer-development -> viewer-horde-fixes
2012-07-26 22:59:30 +00:00
Ansariel
08f35b6a14
STORM-1899: Avatar hand poses randomly get stuck in spread position
2012-07-26 17:07:12 +02:00
Oz Linden
124f45d20e
another change to force a new ticket, disable some codeticket features
2012-07-25 21:16:09 -04:00
callum_linden
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
Aura Linden
1154d5afde
Reverted boost/cocoa changes to purely Mountain Lion fixes.
2012-07-25 16:08:27 -07:00
Aura Linden
3b560d4c49
Some cocoa that doesn't work
2012-07-25 16:03:50 -07:00
Oz Linden
6059ac5f6c
clean up BuildParams and change to force a new ticket
2012-07-25 18:22:48 -04:00
Oz Linden
f8374e0f1f
increment version to 3.4.0
2012-07-25 16:23:10 -04:00
Nyx (Neal Orman)
020980fb4c
SH-3258 WIP Adding new switching of new vs old appearance based on appearance message
...
Not all appearance messages on a region will be new or old style at all times.
Thus we're using a specific flag to mark the new appearance messages.
2012-07-25 15:22:13 -04:00
Oz Linden
20d7de14fd
tag merge of DRTVWR-182
2012-07-25 13:58:48 -04:00
Oz Linden
33afaadf5b
pull latest pathfinding changes from integration branch
2012-07-25 12:31:57 -04:00
Oz Linden
01b7959e01
update to latest builds of llphysicsextensionss
2012-07-25 12:31:16 -04:00
Todd Stinson
b8cca9c6e6
Adding a group identifier to the group objects in the pathfinding linksets and characters floaters.
2012-07-24 17:50:24 -07:00
Aura Linden
a1d0268893
Minor improvement to identifying gl lib to use. Should use xcode version.
2012-07-24 16:52:33 -07:00
Aura Linden
ed4b379067
Eliminated countFilesInDir boostified getCurPath for OSX
2012-07-24 12:11:20 -07:00
Oz Linden
ef37311e9e
merge up to latest viewer-pathfinding (including 3.3.4)
2012-07-24 13:11:14 -04:00
Oz Linden
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
Nat Goodspeed
300662919e
Engage dormant first-login-this-install popup message.
...
Although the XUI for this popup, and the code to display and respond to it,
have been present from the first rev in the current viewer repository, I can
find no trace of it ever having been called.
Reword embedded link in popup message in each supported language: directly
mentioning secondlife.com in display text engages anti-URL-spoofing logic,
causing the popup to display the whole messy URL with sourceid and lang
params. Change to say "Second Life web site" instead -- needs translations.
2012-07-24 08:54:01 -04:00