Age | Commit message (Collapse) | Author |
|
|
|
into DRTVWR-515-maint
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
|
|
|
|
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
|
|
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
|
|
|
group IM)
|
|
that group IM will not open even if unblocked people chat.
|
|
account based.
|
|
plays New Conversation sound
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setting is enabled
|
|
|
|
|
|
|
|
received
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
|
|
|
|
Added "raw" coroutine handler (returns raw result as LLSD::Binary) and split out the guts of the get, put, etc methods.
Moved getStatusFromLLSD from HttpCoroHandler into HttpCorutineAdapter
|
|
|
|
|
|
|
|
group chat.
|
|
only then show autoreject message
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
|