Age | Commit message (Collapse) | Author |
|
|
|
|
|
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
|
Partially reverts SL-20206 commit 25388312cf28f8b30934ac3885783a96a3b2ed69
|
|
|
|
# Conflicts:
# autobuild.xml
|
|
|
|
|
|
|
|
Alt zoom was pointing near ground instead of agent's actual position
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llappviewer.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
|
|
|
|
|
getCameraOffsetInitial() call can happen before init()
|
|
|
|
|
|
|
|
constraints
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Camera preset, not as separate setting
|
|
|
|
|
|
|
|
|
|
Viewer should now filter out position changes from server when avatar is being edited.
|
|
preset in some cases
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in xml
|
|
|
|
|
|
|
|
|
|
|