Oz Linden
34757f71c6
merge changes for storm-1529
2011-07-29 11:10:22 -04:00
Oz Linden
91061fcd02
merge changes for storm-1404
2011-07-29 11:09:53 -04:00
Oz Linden
59535e71c1
merge changes for storm-1291
2011-07-29 11:09:19 -04:00
Oz Linden
0732d383d0
merge changes for storm-1233
2011-07-29 11:08:33 -04:00
Oz Linden
b4df9fd202
merge changes for storm-1220
2011-07-29 11:08:00 -04:00
Oz Linden
58ff6b5033
merge changes for storm-1311
2011-07-29 11:07:27 -04:00
Oz Linden
8554772a3c
merge changes for storm-1234
2011-07-29 11:05:09 -04:00
Oz Linden
97030fe7a6
merge back beta tags
2011-07-28 14:27:29 -04:00
Oz Linden
2155f0601a
merge back release tags
2011-07-28 14:26:58 -04:00
Oz Linden
1ba2176292
merge changes for storm-1474
2011-07-27 20:12:37 -04:00
Vadim ProductEngine
2617d56241
STORM-1529 FIXED Made the Sound Devices floater wider.
2011-07-27 00:37:00 +03:00
Debi King (Dessie)
254263cffc
Added tag DRTVWR-70_2.8.0-release, 2.8.0-release for changeset 493d9127ee50
2011-07-26 15:51:25 -04:00
Debi King (Dessie)
ed701685f6
merged .hgtags
2011-07-26 15:41:49 -04:00
Vadim ProductEngine
a1b99c4821
STORM-1291 FIXED Localize names of inventory items fetched via HTTP post requests.
...
These were not localized, unlike ones fetched via the message system.
2011-07-26 18:28:06 +03:00
Vadim ProductEngine
7e405ef0e3
STORM-1220 FOLLOWUP Prevent displaying unlocalized sim product name.
...
Removed LLViewerRegion::getSimProductName() so that it doesn't mistakenly
get used in UI code, thus causing localization bugs.
2011-07-25 23:46:28 +03:00
Oz Linden
825fc273ee
merge fix for SH-2031
2011-07-25 14:38:02 -04:00
Vadim ProductEngine
149ca39681
STORM-1233 FIXED Made the "Profile" button translatable in the Places panel by providing its layout stack with a unique name.
2011-07-25 19:48:43 +03:00
Debi King (Dessie)
6a15da0133
merged .hgtags
2011-07-25 11:56:49 -04:00
Debi King (Dessie)
0e3cea49aa
Added tag DRTVWR-73_2.8.1-beta1, 2.8.1-beta1 for changeset 2c7e459e0c88
2011-07-25 11:52:43 -04:00
Oz Linden
4c32fb0455
increment viewer version to 2.8.3
2011-07-25 10:58:48 -04:00
Oz Linden
723d05e6df
Added tag 2.8.2-start for changeset 54bc7823ad4e
2011-07-25 10:58:11 -04:00
Vadim ProductEngine
c645e9e59e
STORM-1220 FIXED Localized sim product name (e.g. "Estate / Full Region") everywhere.
2011-07-25 17:34:06 +03:00
Oz Linden
b8be8820ea
close head created by 54e071a92450
2011-07-25 09:49:58 -04:00
Oz Linden
e072806525
merge changes for storm-1458
2011-07-25 09:48:57 -04:00
Dave Parks
b26ff4b4ed
SH-2031 Fix for bad vertex shader/fragment shader varying usage.
2011-07-25 00:00:04 -05:00
Dave Parks
0ebf271a58
merge
2011-07-24 16:19:55 -05:00
Dave Parks
6465218f18
Go back to useful head
2011-07-24 16:18:39 -05:00
Dave Parks
578e44d9b8
dummy check in to make hg happy
2011-07-24 15:55:44 -05:00
Dave Parks
a5769e8126
terminating accidental merge
...
--HG--
branch : oops
2011-07-24 15:44:46 -05:00
Dave Parks
0f86c26fa5
merge
2011-07-24 15:10:13 -05:00
Oz Linden
6df418b7af
merge changes for storm-1526
2011-07-22 22:07:50 -04:00
Dave Parks
26a9a6929c
SH-2031 Fix for sometimes deadlocking a curl thread.
2011-07-22 16:22:51 -05:00
Vadim ProductEngine
632ae75211
STORM-1404 FIXED Light viewer: untranslated buttons in the People panel.
...
Bug reason: incorrect reuse of an xml element name.
Fix: provided unique names for the buttons.
2011-07-22 20:47:55 +03:00
Oz Linden
7ac2307501
merge back release branch changes
2011-07-22 10:46:25 -04:00
Vadim ProductEngine
e67bc88737
STORM-1311 FIXED Provide more space for parcel description in the Place Profile when coming from search.
...
This also affects the way teleport history items look.
In the first place I tried to make the description occupy all available space
and follow viewer window shape. However that triggered numerous bugs in the
text widgets, which spoiled the whole fix.
So I'm coming up with a temporary hacky solution that should fit
the ticket requirements.
2011-07-22 17:35:05 +03:00
Nat Goodspeed
d28e411af6
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-22 10:01:42 -04:00
Oz Linden
ebbadcf772
merge changes from snowstorm team review build
2011-07-22 09:06:42 -04:00
Paul ProductEngine
298bb68484
STORM-1474 FIXED Implement Show Last Search in viewer chrome
...
- Minimize the search floater on teleport
2011-07-22 15:22:59 +03:00
Dave Parks
e4a8ef4ce2
SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown).
2011-07-22 02:33:55 -05:00
Dave Parks
c337888553
SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls.
2011-07-22 01:07:48 -05:00
Dave Parks
7b6afd1eba
SH-2031 Followup to curl threading work -- don't start and stop the thread on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms)
2011-07-21 23:33:23 -05:00
Dave Parks
764a13a196
SH-2031 Don't do network I/O from the main thread in llcurl.
...
Reviewed by Kelly
2011-07-21 17:35:04 -05:00
Oz Linden
c118ec2099
merge up changes for 2.8.0 release
2011-07-21 15:02:03 -04:00
Dave Parks
65d82fe192
SH-2031 Fix for stall in "Cleanup"
2011-07-21 13:10:28 -05:00
Oz Linden
d26356d7e1
merge changes for storm-1519
2011-07-21 09:32:10 -04:00
Oz Linden
dcc57bbb0e
merge changes for eli2_viewer-development
2011-07-21 09:30:22 -04:00
Oz Linden
91bc7e34cf
merge late beta fixes
2011-07-21 09:25:46 -04:00
Oz Linden
09c18af318
merge changes for release tags
2011-07-21 09:25:08 -04:00
Dave Parks
aaecc4c53c
SH-2020 Fix for avatar skin/eyes and trees being bright/black/busted underwater.
2011-07-21 00:42:48 -05:00
Dave Parks
e52caca712
SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness.
2011-07-20 23:50:44 -05:00