7d1bd682cd
cut back log spam
2013-03-18 13:38:13 -04:00
409e9202dd
merge
2013-03-18 11:46:12 -04:00
605a99010f
merge
2013-03-18 11:39:21 -04:00
34181d1566
BUILDFIX new appearance utility src for fixing a runtime error
2013-03-18 11:36:37 -04:00
e288ff9695
SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loading
2013-03-15 13:26:31 -04:00
24a6c3fda2
modified_cof_cb() issues a updateAppearanceFromCOF() right before this function - removed extra update call. Sh-3650 & Sh-3985
2013-03-14 14:43:11 -04:00
6f193d54da
SH-3806 FIX test case for local bakes being wrong
...
Local bakes were following folder links in some cases, causing unworn items to be rendered.
Fixed the cof fetcher, now they should no longer show up.
2013-03-13 17:52:40 -04:00
dd1f89d3a9
SH-3975 WIP - consolidated texture fetch state changes to simplify tracking
2013-03-13 17:21:26 -04:00
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
cec50f8c14
Fix for gcc 4.6 build failures on Linux in llwindowsdl.cpp
2013-03-13 19:17:13 +00:00
e42e9f897c
Fixed unit test compile error
2013-03-13 15:01:27 -04:00
54275b941d
merge
2013-03-13 13:40:36 -04:00
71f2032caa
Ported sunshine-internal fixes (Commits: 5271cc5 and b37c09)
2013-03-13 13:36:45 -04:00
45838b8b07
fix for build failure
2013-03-13 11:19:21 -04:00
7405554290
Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter
2013-03-13 08:49:26 +00:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
0123ab0dc6
Removed unneeded code.
2013-03-12 11:02:00 -04:00
0cda978db9
#include fix
2013-03-11 18:15:40 -04:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
9ea6a96be9
LLWindow merge fixes for Mac
2013-03-11 17:29:05 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
9514210beb
more test build fix
2013-03-11 14:58:55 -04:00
957c8303be
Added gratuitous coupling to stop gcc from complaining
2013-03-11 14:51:45 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
175190ac7a
Fix for build failure in tests
2013-03-11 13:52:29 -04:00
e0ecc93e34
merge
2013-03-11 07:37:03 -04:00
7e967ce2fd
SH-3941 SH-3954 FIX local appearance does not update properly
...
We were using an indicator of whether there *was* a baked texture to whether we
were *using* a baked texture. Switched to one of the (several) proper indicators
of whether a baked texture was in use. This should allow local texture data to
get marked for download when we enter appearance mode.
Local testing confirms that old apperances linger for a second or two, but are
soon replaced by the correct local renders.
2013-03-08 18:45:33 -05:00
5a436e46f6
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-08 17:07:17 -05:00
25255ee13e
merge
2013-03-06 17:21:21 -05:00
2784a515b0
SH-3954 SH-3941 SH-3910 FIX local appearance does not update
...
We suppress texture downloads for local textures not needed with server side
baking. We need to explicitly re-set texture priority for local textures
when entering appearance mode.
2013-03-06 17:20:33 -05:00
82c92ce5a9
CHUI-821 Clean up code
2013-03-06 19:02:19 +02:00
4a50271c19
CHUI-821 Clean up code
2013-03-06 19:00:28 +02:00
fe042430b0
Fix for windows build failure
2013-03-06 10:46:43 -05:00
b3e34545a4
merge
2013-03-06 09:53:57 -05:00
7b0b5726dd
make it clearer when DebugForceAppearanceRequestFailure is on
2013-03-06 09:53:11 -05:00
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
9a0c52a247
Adding debug setting to allow overriding appearance service url
2013-03-05 11:28:06 -08:00
96225b4424
Pull from viewer-beta (version number update and tag)
2013-03-05 11:13:40 -08:00
6600c6dcc9
merging
2013-03-05 17:36:51 +00:00
477920b138
CHUI-809 FIXED "Start IM" menu item is added
2013-03-05 15:40:31 +02:00
67741ae978
CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chat
2013-03-05 15:28:41 +02:00
a5861a4a49
CHUI-772 FIX User sees no notification of conversation activity not visible in long scrolling conversation list
...
Added call to setSelectedSession() from LLConversationViewParticipant::handleMouseDown()
2013-03-05 00:41:22 +00:00
f352c81f11
For MAINT-2423 fix regression from CHUI merge. Code review: DaveP
2013-03-04 14:18:49 -08:00
b5d7800347
Automated merge
2013-03-04 12:02:28 -08:00
2efe411a4f
Reducing amount of cof link data sent to appearance update service. Allowing links to items with 'null' asset ids to be passed
2013-03-04 12:02:02 -08:00
3d1ec8b462
merge
2013-03-04 10:14:41 -08:00
2e94202686
Removed deprecated calls to incrementCofVersion
2013-03-04 13:14:35 -05:00
9f965be297
CHUI-778: Now when changing paths for chat logs and transcripts any empty conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded.
2013-03-04 10:11:51 -08:00
Brad Payne (Vir Linden)