Ansariel
|
e33d2fad5f
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
|
2024-06-21 19:10:44 +02:00 |
|
Ansariel
|
3da533c5eb
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
|
2024-05-20 23:46:53 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
0cf61eed93
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
|
2024-04-16 11:41:43 +02:00 |
|
Ansariel
|
0dd4b94ef0
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llcommon/llpointer.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/en/panel_performance_complexity.xml
# indra/newview/skins/default/xui/en/panel_performance_huds.xml
|
2024-04-10 12:32:32 +02:00 |
|
Roxie Linden
|
1f177d837c
|
fixup tabs
|
2024-03-11 14:41:12 -07:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
8c16ec2b53
|
Convert BOOL to bool in LLControlGroup and related classes
|
2024-02-21 03:00:25 +02:00 |
|
Roxie Linden
|
976a75ed24
|
Fix voice device settings
|
2024-02-08 18:34:01 -08:00 |
|
Andrey Kleshchev
|
a16babdf7d
|
SL-18049 Part 4; Adjustments and fixes
|
2023-08-04 18:29:02 +03:00 |
|
Andrey Kleshchev
|
08484cec5a
|
SL-18049 Part 2; Added a button to preferences to enable sound when possible
|
2023-08-03 22:42:37 +03:00 |
|
Oz Linden
|
4ab4bfb2c7
|
VOICE-59: better fix for display human-friendly names for voice input and output devices
|
2018-04-15 09:41:47 -04:00 |
|
Oz Linden
|
73b44833a6
|
VOICE-59: display human-friendly names for voice input and output devices
|
2018-04-13 20:34:10 -04:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Bjoseph Wombat
|
f3120efae8
|
Mic setting changes some device list is up to date, mic loop test works,
removed obsolete code and fine tuned voice state machine to avoid frequent
neccessary code paths.
|
2015-03-22 13:04:09 -04:00 |
|
Richard Linden
|
5b846ed2a6
|
merge with release
|
2014-03-12 12:48:43 -07:00 |
|
maksymsproductengine
|
e6c85c46c4
|
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
|
2014-02-05 20:45:09 +02:00 |
|
Richard Linden
|
0a96b47663
|
merge with viewer-release
|
2013-06-05 19:05:43 -07:00 |
|
Richard Linden
|
41b4374760
|
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
|
2013-05-10 17:57:12 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Vadim ProductEngine
|
4e23f4b74c
|
STORM-1405 WIP Localized the "No Device" and "Default System Device" strings in the sound devices panel.
By the way, fixed improper localization of the "Default" device name
which caused saving a localized string in settings.
|
2011-07-26 23:14:02 +03:00 |
|
Vadim ProductEngine
|
c7158f3b4d
|
STORM-1405 WIP Eliminated redundant getChild() calls.
|
2011-07-26 20:14:13 +03:00 |
|
Leyla Farazha
|
90d41bd746
|
EXP-819 Turning off Voice Chat setting in Basic mode reverts changes made in Sound Device selection and turning setting back on results in drop downs not being populated
|
2011-05-16 15:17:27 -07:00 |
|
Leyla Farazha
|
c83eff097e
|
EXP-760 Selecting No Device for output and input in Sound Devices in Basic mode still results in voice having input and output - also 2 default options
|
2011-05-11 17:46:51 -07:00 |
|
Leyla Farazha
|
f3bb2e31dc
|
EXP-759 Opening the Voice preferences window from the up arrow on the speak button turns voice off for user without notice also causes calls to be ended
|
2011-05-04 11:16:08 -07:00 |
|
Leyla Farazha
|
37ef2c4f0f
|
EXP-670 Voice for basic mode
reviewed by Merov
http://codereview.lindenlab.com/6231263/
|
2011-04-27 16:45:33 -07:00 |
|
Aimee Linden
|
c5e2348e94
|
STORM-122 FIXED Clean up obsolete floaters and related dead code
A little bit more clean up on LLPanelVoiceDeviceSettings while I'm in there.
|
2010-09-17 10:42:44 +01:00 |
|
Aimee Linden
|
ae81cf5dc4
|
STORM-122 FIXED Clean up obsolete floaters and related dead code
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.
|
2010-09-16 17:51:27 +01:00 |