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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Multiline support for current time, space for correct wrap; Fixed text getting out of bonds for labels; Space from time_label was not working;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-481
Merge
|
|
|
|
notification
|
|
|
|
|
|
picker
|
|
|
|
|
|
fiexes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
upload fees
|
|
|
|
|
|
|
|
|
|
upload prices for different asset types. Also added a confirmation dialog for bulk upload.
|
|
Group-related costs and limits via benefits.
|
|
|