Age | Commit message (Collapse) | Author |
|
Removed obsolete XUI files:
floater_activeim.xml
floater_customize.xml
floater_device_settings.xml
floater_first_time_tip.xml
floater_im.xml
floater_my_friends.xml
floater_outfit_save_as.xml
floater_preview_classified.xml
floater_preview_event.xml
floater_preview_gesture_info.xml
floater_preview_gesture_shortcut.xml
floater_preview_gesture_steps.xml
floater_statistics.xml
floater_wearable_save_as.xml
panel_audio_device.xml
panel_friends.xml
panel_groups.xml
panel_nearby_chat.xml
panel_online_status.xml
panel_region_general_layout.xml
Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
|
|
|
|
|
|
1.23s UI
reviewed by Leyla
|
|
|
|
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
|