Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
- Fixed line endings in xml file
- Removed obsolete UI element and it's code
- Fixed issue with return value caused by rebase
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
following promotion of DRTVWR-508
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
following promotion of DRTVWR-460
|
|
|
|
|
|
following promotion of DRTVWR-500
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
following promotion of DRTVWR-440
|
|
|
|
|
|
|
|
|