Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
# Conflicts:
# README.md
|
|
|
|
Just in case
|
|
|
|
|
|
|
|
in stats window
|
|
|
|
|
|
This reverts commit a5675bedbb2bd34ce03dd16651dc74d8078efea9.
Commit slipped in by accident
|
|
drag in EQR preview window
|
|
orthogonal throughout
|
|
|
|
internal repo to public one.
|
|
|
|
|
|
|
|
|
|
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
|
|
|
|
|
|
back into faces
|
|
|
|
handled correctly now
|
|
screw ups)
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Trying out 'sloppy' variant
|
|
|
|
|