Age | Commit message (Collapse) | Author |
|
after clicking the collapsing smiley button
|
|
|
|
|
|
are clicked
|
|
|
|
|
|
|
|
|
|
more informative
|
|
|
|
|
|
the button
|
|
|
|
|
|
|
|
Updated gmock complains about missing regex_t. This is likely a macos
configuration issue and needs to be fixed, but fot now just forcing the
declaration
|
|
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
following promotion of DRTVWR-582
|
|
|
|
simulator
|
|
|
|
DRTVWR-577 (#232)
|
|
|
|
INTL-490 Japanese Translation Update
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
|
following promotion of DRTVWR-580
|
|
|
|
|
|
|
|
|
|
|
|
|
|
improvements can lead to perceived inventory loss due to cache corruption"
This reverts commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99.
|
|
|
|
|
|
|
|
|
|
|
|
Changes do not appear to add anything sans mac's line ending which triggers coding policy protection and shouldn't be present in window's installer file.
|
|
|
|
|
|
to resolve conflicts in installer_template.nsi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|