Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit adb724564da73a4b2d1ebf7835ce628448048d87.
|
|
after the first gesture's editing
|
|
|
|
This reverts commits:
126877bc5ba45ff6b0b31368c55f894a0beaf5bf
b661f62a7ad4dad9806eda8f4c8f2c9d64b3efbb
ce660c7e7bb6e19a23d634fb6d3249330bf2d74c
|
|
|
|
Due to changed defaults, legacy compatibility will no longer work corectly, remove it
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|