Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/llinventorygallery.cpp
|
|
following promotion of secondlife/viewer #673
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llchiclet.h
|
|
|
|
|
|
|
|
|
|
|
|
Now should match LLOctreeIntersect's check
|
|
a preset...' option of the 'Preferences' floater
|
|
controlFlagsDirty() gets set every frame as an example if 'w' is held,
causing viewer to send updates each frame, which can be excessive
|
|
|
|
|
|
available to all users
|
|
|
|
empty space
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
remove unused typedef
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
|
|
|
|
|
|
|
following promotion of DRTVWR-596
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|