Shyotl 93ca5d3482 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap ...

Conflicts:
	indra/newview/skins/default/xui/en-us/floater_active_speakers.xml

2013-06-27 22:07:31 -05:00

..

alerts.xml

Translations updated

2012-07-16 17:07:22 -04:00

floater_about_land.xml

Copypasta went stale, I had to throw it out.

2013-06-20 22:43:41 -04:00

floater_about.xml

Polish About floater Credits tabs, and remove translation of Credits and Licenses tabs.

2012-08-21 18:39:55 -04:00

floater_active_speakers.xml

Fixup active speakers floater

2013-06-27 20:21:32 -05:00

floater_animation_bvh_preview.xml

Add support for uploading .anim files.

2013-04-25 19:05:52 +02:00

floater_area_search.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_auction.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_audio_volume.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_avatar_picker.xml

Cleanup, further hardening of namecache callbacks, and update to avatar picker.

2013-01-30 22:04:04 -06:00

floater_avatar_textures.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_beacons.xml

Applied moap beacon patch.

2013-06-25 16:21:51 -05:00

floater_build_options.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_bulk_perms.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_bumps.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_buy_contents.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_buy_currency.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_buy_land.xml

Translation cleanups and xml fixes

2013-05-21 05:41:51 -04:00

floater_buy_object.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_camera.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_chat_history.xml

French Translation Update

2013-05-12 20:09:34 -04:00

floater_chatterbox.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_choose_group.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_color_picker.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_critical.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_customize.xml

French Translation Update

2013-05-12 20:09:34 -04:00

floater_day_cycle_options.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_directory.xml

LLAvatarActions all hooked up!

2013-05-29 23:56:33 -04:00

floater_display_name.xml

Translations updated

2012-07-16 17:07:22 -04:00

floater_env_settings.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_font_test.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_gesture.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_god_tools.xml

Translation cleanups and xml fixes

2013-05-21 05:41:51 -04:00

floater_html.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_hud.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_im.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_image_preview.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_inspect.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_instant_message_ad_hoc.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_instant_message_group.xml

French Translation update.

2013-01-16 09:27:25 -05:00

floater_instant_message.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_inventory_item_properties.xml

French translation update

2013-04-17 21:00:32 -04:00

floater_inventory_view_finder.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_inventory.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

floater_joystick.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_lagmeter.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_land_holdings.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_landmark_ctrl.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_live_lsleditor.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_lsl_guide.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_media_browser.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_mem_leaking.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_mini_map.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_moveview.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_mute_object.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_mute.xml

Mute list, now with 100% more text-appearing-ness, and 20% new shinies (mute-type icons, multi-select unmute, and displayname support).

2012-12-14 16:24:51 -06:00

floater_my_friends.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_name_description.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_new_outfit_dialog.xml

French translation update

2013-04-17 21:00:32 -04:00

floater_notification.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_notifications_console.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_object_im_info.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_openobject.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_pay_object.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_pay.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_perm_prefs.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_post_process.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_postcard.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preferences.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_animation.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_classified.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_event.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_existing_landmark.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_gesture.xml

Updated gesture floater to use more modern (and actual working) method of adding list elements via xml.

2013-01-14 18:41:48 -06:00

floater_preview_notecard_keep_discard.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_notecard.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_sound.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_texture.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_preview_url.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_price_for_listing.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_profile.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_region_info.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_report_abuse.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_script_debug.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_script_ed_panel.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_script_preview.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_script_queue.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_script_search.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_select_key.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_sell_land.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_settings_debug.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_sim_release_message.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_skin_preview_template.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_snapshot.xml

Minor french translation update, thanks Nomade~

2013-02-06 00:27:22 -05:00

floater_sound_preview.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_statistics.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_telehub.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_test.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_texture_ctrl.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

floater_tools.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

floater_top_objects.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_tos.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_url_entry.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_voice_effect.xml

[Voice Update] LLFloaterVoiceEffect (Lives in File->Show Voice Morpher for now)

2013-06-13 05:23:35 -04:00

floater_water.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_wearable_save_as.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_windlight_options.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

floater_world_map.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

fonts.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_inventory.xml

Added Delete System Folder entry to xmls, it won't work on release builds, of course.

2013-05-30 18:30:06 -04:00

menu_login.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_media_ctrl.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

menu_mini_map.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_pie_attachment.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_pie_avatar.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_pie_land.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_pie_object.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_pie_self.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_slurl.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

menu_viewer.xml

French Translation Update!

2013-04-24 14:17:31 -04:00

notifications.xml

[Voice Update] LLVoiceClient

2013-06-03 22:20:27 -04:00

notify.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_audio.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_avatar_classified.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_avatar_pick.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_avatar.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_chat_bar.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_classified.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_event.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_friends.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

panel_group_general.xml

xmllint fixups

2013-03-03 09:58:02 -05:00

panel_group_invite.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_group_land_money.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

panel_group_notices.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_group_roles.xml

UI cleanup.

2013-04-16 00:25:59 -05:00

panel_group_voting.xml

xmllint fixups

2013-03-03 09:58:02 -05:00

panel_group.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_groups.xml

Translations updated

2012-07-16 17:07:22 -04:00

panel_land_covenant.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_login.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_master_volume.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_media_controls.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_media_remote_expanded.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_media_remote.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_media_settings_general.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_media_settings_permissions.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_media_settings_security.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_mini_map.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_nearby_media.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_notifications_channel.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_overlaybar.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_place_small.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_place.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_preferences_ascent_chat.xml

Update to french translation, thanks Nomade.

2013-05-25 15:30:55 -04:00

panel_preferences_ascent_system.xml

Cleanup from review

2013-06-27 05:39:04 -04:00

panel_preferences_ascent_vanity.xml

Translation updates

2013-04-23 09:23:23 -04:00

panel_preferences_audio.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_preferences_chat.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_preferences_general.xml

More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs.

2013-06-01 05:11:18 -05:00

panel_preferences_graphics1.xml

French translation update, thanks Nomade~

2013-01-20 10:25:19 -05:00

panel_preferences_grids.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_preferences_im.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_preferences_input.xml

French Translation Update

2013-05-12 20:09:34 -04:00

panel_preferences_network.xml

French Translation Update!

2013-04-24 14:17:31 -04:00

panel_preferences_popups.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_preferences_skins.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_preferences_voice.xml

[Voice Update] LLVoiceClient

2013-06-03 22:20:27 -04:00

panel_preferences_web.xml

French translation update/cleanup

2013-05-13 06:05:39 -04:00

panel_region_covenant.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_region_debug.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_region_environment.xml

[Issue 662] Translations retouch

2013-03-03 14:48:03 -05:00

panel_region_estate.xml

[Issue 662] Translations from upstream to ease the resulting load on translators.

2013-03-02 14:32:26 -05:00

panel_region_general.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_region_terrain.xml

[Issue 662] Translations retouch

2013-03-03 14:48:03 -05:00

panel_scrolling_param.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_sound_devices.xml

[Voice Update] LLVoiceClient

2013-06-03 22:20:27 -04:00

panel_speaker_controls.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_status_bar.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_toolbar.xml

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

panel_voice_controls.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_voice_effect.xml

[Voice Update] LLPanelVoiceEffect added to LLFloaterActiveSpeakers

2013-06-13 06:29:00 -04:00

panel_voice_options.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_voice_remote_expanded.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

panel_voice_remote.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

role_actions.xml

Fix French role_actions.xml parsing warning

2013-03-02 22:20:42 -05:00

strings.xml

Fix the crash upon hitting select for an object's light color feature

2013-06-25 23:02:15 -04:00

teleport_strings.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

ui_strings.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00

xui_version.xml

Translation file clean-up

2012-08-13 02:23:08 +02:00