Age | Commit message (Collapse) | Author |
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
|
|
following promotion of DRTVWR-540
|
|
|
|
|
|
|
|
|
|
|
|
|
|
search
|
|
|
|
|
|
|
|
|
|
|
|
Now, when the viewer decides it's appropriate to display release notes on the
login screen, wait for SLVersionChecker to post the release-notes URL before
opening the web floater.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commits b21c17eee973dc06c1392dd45dbc19c1ce394852 and 2f78338aeb3d0297813bc9c9c7a9d75a2055000d.
'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
|
|
|
|
|
|
|
|
DRTVWR-540-maint
|
|
DRTVWR-540-maint
|
|
in an error handling block
|
|
python2 syntax
|
|
|
|
Triangle limit
|
|
before first login
|
|
|
|
|
|
|
|
|
|
|
|
Due to changes in SL-16715
|
|
|
|
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
|
|
following promotion of DRTVWR-557
|
|
|
|
|
|
|
|
|
|
There shouldn't be any differences for 'None' between normal objects and attachments
|
|
SL-14961 works better for windows than rethrow
|