Age | Commit message (Collapse) | Author |
|
|
|
|
|
remove unused typedef
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
|
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
|
|
following promotion of DRTVWR-596
|
|
|
|
|
|
|
|
file changes
|
|
|
|
|
|
|
|
(cherry picked from commit a7dcb0df2a11377b1112dfa0720e876507e1ae3d)
|
|
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
HDRI (addresses blue sheen).
|
|
above water.
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
|
|
|
|
|
|
|
|
|
|
shutdown crash
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
|