Age | Commit message (Collapse) | Author |
|
|
|
|
|
Since python 3.3 sys.platform for Linux will always be 'linux'. See https://bugs.python.org/issue12326 - fix by NickyD
|
|
|
|
following promotion of DRTVWR-554
|
|
|
|
entitlements
|
|
|
|
following promotion of DRTVWR-552
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
# Conflicts:
# README.md
|
|
following promotion of DRTVWR-545
|
|
by Callum
|
|
|
|
PRODUCT_BUNDLE_IDENTIFIER
|
|
|
|
|
|
|
|
|
|
by Callum
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
|
|
|
|
|
|
|
|
|
|
|
|
following promotion of DRTVWR-520
|
|
|
|
|
|
|
|
|
|
|
|
The same should probably be done for onClickTouch
|
|
|
|
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing
changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5.
# Conflicts:
# indra/newview/llmachineid.cpp
|
|
|
|
With the affected line, local Mac builds with BugSplat enabled fail. Without
it, they build clean.
|
|
the avatar without selecting part of the avatar
|
|
another machine
|
|
|
|
|
|
|
|
|
|
|