Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
|
|
|
|
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
|
|
|
|
|
|
|
|
|
|
|
preferred_media_size was repositioning the floater
|
|
|
|
The Guidebook should remember it's open/closed state between sessions.
The Guidebook button should show as pressed while the Guidebook is open.
|
|
|
|
search.
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
|
|
|
|
|
|
|
|
Obsolete driver detection
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
|
|
|