Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llui/llscrolllistctrl.cpp
|
|
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/llappviewer.cpp
|
|
|
|
|
|
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
|
|
|
|
|
|
|
|
|
|
This reverts commit ca6bb3506d13975bd5a817a09658fa78d7716cc6.
|
|
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
|
|
This reverts commit ad3f7252229e476f6e85f7b5d274aa6ee362fce1.
|
|
|
|
|
|
|
|
These views are 'heavy' and rarely used, don't init them all the time.
|
|
See changes from SL-13119 and SL-13190
|
|
|
|
|
|
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
|
|
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
|
|
|
|
In scope of SL-13740 work, this reverts commit 1935d25c78bf46f0fdc8758b6f215f53d17fd94a.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|