7bcda3a511
ACME-785 : Use a specific notifytip message (without the OK button) for fbc success notification
2013-08-01 20:53:27 -07:00
ee25146ce4
Merge downstream code
2013-08-01 16:19:49 -07:00
9f60fc46e2
Merge
2013-08-01 16:18:39 -07:00
1f6d19436e
ACME: add SLShareHost variable to settings.xml, which allows changing the fb service host location as needed.
2013-08-01 15:12:58 -07:00
2d065562f1
NORSPEC-336 fix glow regression from 304 fix
2013-08-01 14:01:37 -07:00
570884d730
MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"
2013-08-01 12:46:14 -07:00
12bbf0e922
ACME-773 Making cookie clearing occur during disc and connect.
2013-08-01 11:41:55 -07:00
440e576f86
MAINT-2949 : Objects across the sim border do not render when approached. Added
...
missing code block from previous change as per Dave P's advice
2013-08-01 11:38:17 -07:00
4a3c99beb2
NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggle
2013-08-01 10:34:36 -07:00
2698b4ba9c
Automated merge with http://bitbucket.org/lindenlab/viewer-bear
2013-08-01 11:30:43 -05:00
a2b1e06c3d
ACME-778: Adjusted the facebook code so that isConnected() does not depend on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected.
2013-07-31 19:04:45 -07:00
d0764f57a5
ACME-757: Switching back to pdp15 host for testing.
2013-07-31 13:03:57 -07:00
daa98bf1cf
Merge downstream code
2013-07-30 15:22:00 -07:00
6db14e3988
MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexes
...
bullet-proof. Reviewed by Kelly
2013-07-30 15:12:02 -07:00
42ce98e8bf
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
2013-07-30 13:44:12 -07:00
4a17569605
merge changes for CHOP-975
2013-07-30 16:12:19 -04:00
85c8c1daf0
ACME-757 : Change the hard coded url to fbc service (still a hack)
2013-07-30 13:02:29 -07:00
c1b3f363cc
Merge vwr-dev-mat
2013-07-30 12:05:53 -07:00
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
152d76e13e
MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer goes blank if location is selected and a menu item is seleted
2013-07-30 20:03:21 +03:00
d0432d4d4c
CHOP-975: Remove fallback to v1.0 update query when the v1.1 gets a 404 response
2013-07-30 11:53:47 -04:00
64c1fb0b82
get rid of warning generated by trying to save obsolete VersionChannelName setting
2013-07-30 11:46:08 -04:00
344c42cc3f
Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100
2013-07-30 15:17:02 +00:00
f48fedf84e
Slowest debug in the west.
2013-07-29 21:45:51 -07:00
8f5e2cd839
I love issues that only reproduce via teamcity
2013-07-29 19:16:00 -07:00
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
9d63bb755f
merge changes for maint-2936
2013-07-29 16:04:21 -04:00
91f7d0d154
merge changes for storm-1838
2013-07-29 15:19:54 -04:00
499d132877
Add copyright and license
2013-07-29 15:15:09 -04:00
bdd8005721
ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux).
2013-07-29 12:09:29 -07:00
de3d3cf8aa
merge storm-1958
2013-07-29 14:56:34 -04:00
fd3d20e20d
add credit for storm-1958
2013-07-29 14:49:19 -04:00
8a761f9227
STORM-1838 merge
2013-07-29 13:53:35 -04:00
9e5dbcfde5
STORM-1838 Add display name handling to the initial notification
2013-07-29 13:52:48 -04:00
be89f2f8fb
NORSPEC-314 fixed another mac-specific stupidity by splitting out a new srgb_mac version of the shader
2013-07-28 18:29:51 -07:00
c5fc5d9b46
NORSPEC-323 fix norm/tangent gen for prim caps
2013-07-28 15:43:10 -07:00
d7edd0cfd8
Merge vwr-dev-mat
2013-07-28 14:28:46 -07:00
0f5dbc1935
NORSPEC-314 fix the fullbright alpha mask logic
2013-07-28 14:03:56 -07:00
22a931efad
STORM-1957 World Map - Land For Sale is missing L$ / sqm
2013-07-28 10:42:51 -04:00
9d42176e27
merge
2013-07-26 18:49:50 -07:00
7b56020d66
ACME-755 Clear FB cookies by removing cookies from the .facebook.com domain
2013-07-26 18:49:31 -07:00
50be9d611e
NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering mac GLSL compiler
2013-07-26 12:44:05 -07:00
73703191e0
NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering mac GLSL compiler
2013-07-26 12:44:05 -07:00
0906d000b3
CHOP-955: merge viewer_manifest.py file_list fix
2013-07-26 10:42:58 -04:00
a207b24d33
CHOP-955: Include app_settings/settings_install.xml in file_list.
...
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file()
method to create several different files in the install image being
marshalled. I based the logic to create settings_install.xml on that example.
Unfortunately I failed to notice that after every existing call, the script
also explicitly appended the newly-created file to self.file_list... which
only matters on Windows. file_list is fed to the NSIS installer.
Change put_in_file() method to implicitly append to self.file_list.
Change every existing viewer_manifest.py call to pass new put_in_file(src=)
param instead of explicitly appending to self.file_list.
2013-07-26 10:42:13 -04:00
1bcce503a9
Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951
2013-07-26 09:00:01 -04:00
f7cdbb2582
CHOP-962: merge code-review fixes with viewer-release
2013-07-26 08:59:37 -04:00
c109361861
CHOP-962: per code review, comment that other code relies on "Global".
...
The comment advises grepping for "Global" rather than specifically pointing to
llcontrol.cpp because that's NOT the only place that relies on the name
"Global"! Besides, by the time someone does want to change the name, still
other such dependencies could've crept in.
2013-07-26 08:58:47 -04:00
56038ded51
ACME-745 : Fix : Do not oversanitize the logged URLs...
2013-07-25 19:35:10 -07:00
0254b74abf
ACME-773 Remove the 'Use another account...' in the ACCOUNT panel
2013-07-25 16:04:58 -07:00
Merov Linden