Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
|
|
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
|
|
|
|
Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track.
|
|
Superficially looks like an out of memory crash, redirect allocation failures into LL_ERRS.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
any attachments
|
|
|
|
|
|
|
|
|
|
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
|
|
render correctly yet]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
server messages
|
|
RenderAutoMuteFunctions
|
|
|
|
|
|
|
|
|
|
named RenderAutoMuteLoggingnot found.
|
|
|
|
|
|
linked objects
Removed "geometry" and "surface" Reviewed by Kelly
|
|
Control named RenderAutoMuteFunctionsnot found
|
|
named RenderAutoMuteLoggingnot found.
|
|
OBJECT_ATTACHMENT_SURFACE_AREA
do not return to the 'no attachments' values after avatar removes last attachment
|
|
|
|
Reviewed by Kelly
|
|
Reviewed by Kelly
|