Age | Commit message (Collapse) | Author |
|
|
|
following promotion of DRTVWR-552
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
# Conflicts:
# README.md
|
|
# Conflicts:
# doc/contributions.txt
|
|
following promotion of DRTVWR-545
|
|
|
|
by Callum
|
|
|
|
PRODUCT_BUNDLE_IDENTIFIER
|
|
|
|
|
|
|
|
|
|
|
|
by Callum
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
|
|
for new 3p repos - no new code introduced in this pass
|
|
|
|
|
|
|
|
|
|
|
|
|
|
following promotion of DRTVWR-520
|
|
|
|
|
|
|
|
In god mode isInGroup always returns true even if id belongs not to a group, but to an agent. But for some cases function is used to determine if session is a group or an agent.
|
|
|
|
Some pending messages might try to update non-existing view or cause a pop up, neither should be avaliable by this point, so just don't process them
|
|
|
|
|
|
|
|
|
|
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing
changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5.
# Conflicts:
# indra/newview/llmachineid.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit adb724564da73a4b2d1ebf7835ce628448048d87.
|