d02b972ae7
merge
2010-08-24 15:45:21 -07:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
46e6135eef
update tags
2010-08-24 15:16:15 +00:00
8c5d7fa7a5
Automated merge with file:///home/moss/hg/tofu-viewer-public
2010-08-24 16:14:17 +01:00
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
01d06a3572
BuildParams - Use new 'build_debug_release_separately' flag for viewer-development-import and viewer-development-fixes
2010-08-24 12:12:56 +01:00
308d9f1014
fix for EXT-8101: [crashhunters] crash in LLVOSky::calcAtmospherics()
2010-08-23 17:32:26 -06:00
f73239bc64
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-23 16:19:50 -06:00
b064285da3
fix for EXT-8730: crash at llrender/llimagegl.cpp(157) : error ERROR: checkTexSize: wrong texture size and discard level: width: 512 Height: 512 Current Level:
2010-08-23 16:16:41 -06:00
17553add7c
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
2c6c4e2e2c
BuildParams for aimee_linden/viewer-development-fixes
2010-08-23 18:01:28 +01:00
b5fc9c3254
VWR-20899 FIXED Minor potential memory leak in LLFlatListView::addItem
2010-08-23 13:12:56 +01:00
da612aa105
CID-370
...
Checker: UNINIT_CTOR
Function: LLVivoxProtocolParser::LLVivoxProtocolParser()
File: /indra/newview/llvoicevivox.cpp
2010-08-21 16:40:47 +01:00
be3e754b34
increment patch level so that version is 2.1.2
2010-08-20 18:59:45 -04:00
9bbc45ae95
change defaults so that developer builds are labelled correctly, add personal build params
2010-08-20 18:58:32 -04:00
d179727469
fix gcc build error.
2010-08-20 12:38:54 -07:00
f726660430
merge from PE's viewer-trunk
2010-08-20 12:17:51 -07:00
bb8919c013
merge from viewer-release
2010-08-20 12:16:46 -07:00
89cb5aa99e
VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in Standalone builds
2010-08-20 18:16:23 +01:00
ba7fa006a1
BuildParams for to separate debug and release builds for viewer-development-import
2010-08-20 15:48:47 +01:00
b783631ba8
Merge
2010-08-20 15:41:16 +01:00
aabf1b4fa2
VWR-20847 (SNOW-543/SNOW-517) FIXED Linux packaging fixes.
2010-08-20 14:06:32 +01:00
9208e09693
add email for new canonical snowstorm build
2010-08-20 06:35:03 -04:00
45b6098477
EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk)
2010-08-19 17:35:08 -07:00
8eb54d67bb
EXT-8668 Added da and pl langs to the windows installer
2010-08-19 16:55:41 -07:00
29512788ad
VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system version of llqtwebkit
2010-08-19 18:36:14 +01:00
a4d969067b
Remove obsolete build configurations from BuildParams.
2010-08-19 09:15:51 -07:00
6f1d8b1d05
VWR-20810 (SNOW-503) Oops ... forgot the doc/contributions.txt entry (No functional change)
2010-08-19 16:03:08 +01:00
4e62d8cc9c
Merge from default branch. Fixed gcc build.
...
--HG--
branch : product-engine
2010-08-19 16:23:42 +03:00
2a1d58fdf6
VWR-20810 (SNOW-503) Quote EXE_STAGING_DIR to prevent it failing with some paths
2010-08-19 14:22:37 +01:00
b9853f8e09
VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a standalone build.
2010-08-19 13:31:45 +01:00
b091125a0e
EXT-8658 FIXED Made only online participants of Adhoc chat to be shown shown in Recent Tab.
...
Used previously commented code which adds only online paricipants instead of current code that added all.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/860/
--HG--
branch : product-engine
2010-08-19 15:11:37 +03:00
6c4b0f82bc
EXT-8635 FIXED Replaced "no matches found" with "Loading..." in the My Outfits tab.
...
Set no items text to "Loading..." when creating the wearable items list and to "There are no items in this outfit" when category is complete.
"Outhfit" is there, because wearable items list nay be empty only for them. This string was introduced, because the only situation when there are
no items shown in outfit tab is for empty outfit- because even when applying filter either all items from outfit will be shown or outfit tab won't be shown at all.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/865/
--HG--
branch : product-engine
2010-08-19 15:09:07 +03:00
d568a36848
Don't bother doing the debug release split on mac for now.
2010-08-18 20:44:02 -07:00
8666d6016c
fix mixup in "last_built_variant" vs "last_built_arch".
2010-08-18 20:30:19 -07:00
75362fc4b2
Upload last built variant, not necessarily Release
2010-08-18 20:28:29 -07:00
985133d74c
Polish build settings for the split between debug and release builds.
2010-08-18 19:49:13 -07:00
7545d6209a
Merged: Enable Coverity, Separate out debug and release builds for faster turnaround.
2010-08-18 19:30:59 -07:00
03813fe219
Enable Coverity, Separate out debug and release builds for faster turnaround.
2010-08-18 19:30:25 -07:00
116382fdf7
fixed for EXT-8963: investigate if Advanced > Run Multiple Threads should be on.
...
Removed "Run Multiple Threads" from the menu because we are not using it.
2010-08-18 15:32:40 -06:00
104aec161e
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-18 12:05:41 -06:00
3ac134ec22
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
...
Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching
2010-08-18 11:33:01 -06:00
2977cbb741
VWR-20770 (SNOW-649) FIXED Missing LL_TESTS condition around llplugin unit test
2010-08-18 17:56:58 +01:00
855192a83b
VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake files
2010-08-18 17:41:36 +01:00
b65bf3f247
Merge from default branch
...
--HG--
branch : product-engine
2010-08-18 18:02:25 +03:00
ac9f9d82a0
Merge from default branch
...
--HG--
branch : product-engine
2010-08-18 17:47:18 +03:00
1d70c6a422
Automated merge with ssh://nyx@hg.lindenlab.com/q/viewer-release/
2010-08-18 10:46:47 -04:00
fe37d350b4
EXT-8542 FIX (?) Avatar goes nude on teleport / outfit change
...
Believed fix, but having difficulty reproducing to verify.
changed logic in switching avatar textures so that we don't use the local
baked texture until we have at least the lowest LOD for each clothing texture.
Will ask Dan to help verify the fix.
Code reviewed by Seraph
2010-08-18 10:46:40 -04:00
5bb7cbc663
VWR-20749 (SNOW-624) FIXED Fix compiling the viewer with Boost 1.42
2010-08-18 13:01:56 +01:00
Mark Palange (Mani)