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
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
00163d131a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 14:17:09 +01:00
314639426d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
a831237e29
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llkdu/llimagej2ckdu.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# scripts/messages/message_template.msg.sha1
2024-02-06 17:58:20 +01:00
23edfd0bfa
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-01-25 20:39:44 +01:00
5e759054ca
FIRE-33578: Reset defaults doesn't reset materials upload folder
2024-01-01 16:22:15 +01:00
de799c897a
Remove orphans of now obsolete custom cloud selection
2019-03-31 12:56:14 +02:00
b88cf4ca91
Minor simplification
2018-05-04 20:08:55 +02:00
1d80eda28e
FIRE-22538: Add button to reset default upload folders
2018-05-04 18:41:46 +02:00
2d278ed791
Fix warnings:
...
* No callback found for: 'FS.CheckContactListColumnMode' in control: FSFriendListColumnShowUserName
* No callback found for: 'FS.CheckContactListColumnMode' in control: FSFriendListColumnShowDisplayName
* No callback found for: 'FS.CheckContactListColumnMode' in control: FSFriendListColumnShowFullName
* No callback found for: 'RLV.ToggleEnabled' in control: checkMiscRLVa
2015-10-08 16:19:20 +02:00
67fceb3ef8
Small round of clean up:
...
* Remove unused includes
* Fix a case of improper declared method
* Fixed a few cases of variable redefintions
2015-05-09 12:20:04 +02:00
d87681f7f8
Implement drop target for embedded items in newly rezzed objects and activate feature
2014-08-27 22:07:37 +02:00
49136bda58
Refactor some weird method naming in FSPanelPrefs
2014-08-08 20:05:33 +02:00
0f5a8c6aa8
More refactoring of LGG's beams code:
...
* Don't use magic "===OFF===" filename for disabling things
* Made missing strings localizable
* Use typedefs instead of int directly
* Use iterators for vectors where it makes sense
2014-08-07 15:02:59 +02:00
550a2cf91f
Refactoring of FSPanelPrefs
2014-08-07 13:01:07 +02:00
a90335c582
FIRE-14297: Add an option so the user can choose which name columns should be displayed in the contact list
2014-08-07 08:47:41 +02:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
f1d2900b06
Add/correct @file to FS files
2013-11-23 20:43:03 -08:00
66a0a02c0d
FIRE-1238: Firestorm-specific preference settings need to be aware of the "cancel" button
2013-08-05 16:43:11 +02:00
3654c3e654
Add missing EOF Newlines
2013-06-29 14:11:44 -06:00
236710ae91
FIRE-1061 Refactor: Allow independent coloring of chat, name tags, and mini-map. Reorganize the Color Preferences panel
2013-05-29 00:40:35 -06:00
201541f407
FIRE-9820: Fix default next owner modify/copy permission which were reversed.
2013-04-19 12:47:30 -06:00
b0c8a20172
FIRE-9704: Fair use permissions in the Build Preference Panel
2013-04-08 21:02:30 -06:00
66e9dd98d9
FIRE-9678: Don't re-use the texture picker's default texture setting for the default texture of newly rezzed prims - people expect the plywood texture behind the default button
2013-04-06 20:11:13 +02:00
cca6f7be8a
Trivial change, use LL_DEFAULT_WOOD_UUID
2013-04-05 20:05:51 -06:00
299b7be330
FIRE-9660: Make sure "default" button on texture picker for default prim texture in Firestorm prefs refers to plywood
2013-04-06 03:50:08 +02:00
29a16359f7
First round of export and import support.
2013-03-24 20:35:24 -04:00
541d804c86
Fixed enabled state of parcel windlight checkboxes in preferences
2013-03-15 12:25:41 +01:00
e855f32b6a
Add support for drop-in cloud noise image replacements (8-bit grayscale targa w/ power of 2 size ONLY)
...
Move clouds2.tga to clouds/Default.tga
2013-01-21 22:30:09 -07:00
aa7b3cb897
Turn off Viewer tags by deafult, add notice to Tags tab of Firestorm preferences.
2012-03-02 22:07:37 -08:00
dcb7dbec36
Fixing FS specific compile after merge of sh-2973 fix.
2012-03-02 15:03:07 -08:00
906dea62dc
Nearby chat working, toolbar layouts mostly behaving.
2012-01-27 23:29:53 +01:00
e02ae7d5a4
Making clrchat command line option work, removed in-code disabling of not-yet-implemented command line options
2012-01-07 01:27:45 +01:00
944efe8811
Made chat channel selector and chat bae in nearby chat panel show/hide at runtime, removing the need of a restart and a second XML file. Fixews/Addresses FIRE-3531, FIRE-4258
2012-01-03 15:10:33 +01:00
dea3558cb2
Make tag color selection fail proof
2011-11-16 20:09:04 +01:00
2963cba30f
Changed tag color from global to account setting. Patch submitted by Satomi Ahn (FIRE-2752)
2011-11-16 19:58:41 +01:00
970369361a
Fix for own tag color not working properly if color string is localized (FIRE-3906)
2011-11-16 19:46:03 +01:00
03bd80d8ae
Pref work: Fixed autocorrect floater button
2011-11-06 17:01:05 -08:00
a8b17cc49f
Pref work: Renamed "panel_prefs_firestorm" source files to "fspanelprefs" (2 of 2)
...
Done in two changeset because hg mv should be done as its own commit without other changes.
2011-11-06 10:37:40 -08:00
7d63ceb04b
Pref work: Renamed "panel_prefs_firestorm" source files to "fspanelprefs" (1 of 2)
2011-11-06 10:33:43 -08:00
Ansariel