Oz Linden
8554772a3c
merge changes for storm-1234
2011-07-29 11:05:09 -04:00
Roxie Linden
fcf0659fc0
Add geotrust CAs for some internal linden machines like teamcity, and move
...
the trust chain around a bit.
2011-07-29 00:09:15 -07:00
Richard Linden
63a857f0c7
EXP-1054 FIX Entering search term in search box in Viewer UI does not produce search results if search window is already open
...
use new parameters when opening existing floater
2011-07-28 19:09:48 -07:00
Roxie Linden
a3e783a97a
update CA's to most current set (taken from the osx lion cert store)
2011-07-28 18:05:31 -07:00
Richard Linden
ca9b47ba57
EXP-1055 FIX Profile button not toggled on when Profile open in Basic mode
2011-07-28 17:38:35 -07:00
Leslie Linden
b8d5c8993d
Reverting 3p library updates for curl, ares, openssl and llqtwebkit to get SSL working properly again, we hope.
2011-07-28 11:33:52 -07: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
Nyx (Neal Orman)
c6ee98394e
merging in latest viewer-dev to mesh merge branch
2011-07-28 11:37:10 -04:00
Dave Parks
cd923af21f
SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.
2011-07-28 00:26:30 -05:00
Oz Linden
1ba2176292
merge changes for storm-1474
2011-07-27 20:12:37 -04:00
Aaron Stone
5e989213ad
CHOP-761 Items now disappear when the sim says so.
2011-07-27 16:24:08 -07:00
Aaron Stone
5eec3a4e51
Swap typename and const.
2011-07-27 16:03:01 -07:00
Richard Nelson
61a7726611
another potential gcc fix
2011-07-27 15:58:52 -07:00
Richard Nelson
5c8f22c640
fix for gcc
2011-07-27 15:34:58 -07:00
Roxie Linden
47f23dd5a5
automated merge
2011-07-27 14:14:22 -07:00
Richard Nelson
061e9efd3e
broken operator= semantics for instance tracker iterators
2011-07-27 13:11:09 -07:00
Richard Nelson
7a43d38eaa
another fix for build
2011-07-27 10:25:45 -07:00
Dave Parks
e16eb4ae4a
SH-1990 Fix for redundantly applying some color scaling to sky and water (also add some snazzy specular bloom from the sun)
2011-07-27 01:04:53 -05:00
Dave Parks
e7474eb48d
SH-2120 Better fix for water being very dark when basic shaders disabled (sinA might be negative)
2011-07-27 00:25:45 -05:00
Dave Parks
531c5c4e49
SH-2120 Fix for water being very dark when basic shaders disabled.
2011-07-27 00:19:54 -05:00
Richard Nelson
75d2382dc3
fixed build
2011-07-26 18:54:07 -07:00
Dave Parks
d11891bfc2
merge
2011-07-26 18:39:12 -05:00
Dave Parks
b9b0255272
SH-2179 Fix for active UI elements glowing when basic shaders enabled.
2011-07-26 18:38:49 -05:00
Richard Nelson
9b6fbf8d57
build fix
2011-07-26 16:10:29 -07:00
Richard Nelson
4a9a360a89
merge
2011-07-26 15:51:11 -07:00
Richard Nelson
6b3a7480a1
merge
2011-07-26 15:47:53 -07:00
Richard Nelson
6bcb677c90
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-07-26 15:38:53 -07:00
Richard Nelson
2c2a4c123e
merge
2011-07-26 15:38:37 -07:00
Vadim ProductEngine
2617d56241
STORM-1529 FIXED Made the Sound Devices floater wider.
2011-07-27 00:37:00 +03:00
Xiaohong Bao
a9c6b5d808
a trivial change: use lldebugs to replace llinfos for STORM-1417.
2011-07-26 15:36:31 -06:00
Richard Nelson
df82fbffa2
removed last vestiges of llinstancetracerscopedguard
2011-07-26 14:35:54 -07:00
Richard Nelson
fd9f3b9fe9
EXP-1021 FIX Position of web content browser dictates position of profile panel - profile panel position changes do not persist
...
EXP-1030 FIX Search button toggle can get out of synch in bottom bar
made llinstancetracker::iterator do own nested level management (removing need for separate guard)
added support for filename= to floaters
can pass in arbitrary window_class to floaters
2011-07-26 14:26:27 -07:00
Vadim ProductEngine
4e23f4b74c
STORM-1405 WIP Localized the "No Device" and "Default System Device" strings in the sound devices panel.
...
By the way, fixed improper localization of the "Default" device name
which caused saving a localized string in settings.
2011-07-26 23:14:02 +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
Xiaohong Bao
58dccd5fe9
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-07-26 12:27:05 -06:00
Vadim ProductEngine
c7158f3b4d
STORM-1405 WIP Eliminated redundant getChild() calls.
2011-07-26 20:14:13 +03: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
Oz Linden
6a52c25d2b
storm-1510: remove loginpage url from settings file (per code review suggestion from Richard)
2011-07-26 10:40:05 -04:00
Nyx (Neal Orman)
c07f55e605
merging latest viewer-development to mesh merge candidate.
2011-07-25 18:26:14 -04: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