Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
'warn-on-failure:no-tabs'
|
|
|
|
|
|
|
|
|
|
|
|
floater
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(long long round) in VS2013
|
|
|
|
|
|
|
|
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
|
|
|
|
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
|
|
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
|
|
- Removed a lot of logging code to reduce application close time
|
|
cause of the crash
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
another attempt to move mem stat into base class
|
|
|
|
|
|
|
|
|
|
|