| Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
|
|
|
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-481
Merge
|
|
|
|
|
|
|
|
|
|
|
|
logining to Viewer
|
|
|
|
|
|
|
|
|
|
Group-related costs and limits via benefits.
|
|
|
|
|
|
|
|
|
|
singleton.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
logs are set to be saved
|
|
|
|
|
|
|
|
|
|
avoid crash
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|