Commit Graph

30 Commits (a52391d582ec7299273d3ff38efdb2455da7700e)

Author SHA1 Message Date
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.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.cpp
#	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/llimpanel.cpp
#	indra/newview/llimpanel.h
#	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/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	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/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +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 a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Nat Goodspeed 2dc4aec993 DRTVWR-568: Eliminate more blockers to C++17 language standard. 2022-08-26 17:21:01 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Paul ProductEngine 338914bd7d EXP-1400 FIXED (Call request docking icon overlays other toolbar buttons when speak button in side toolbar)
- LLDockableFloater::getDockTongue to init dock tongue with proper image depending on floater dock side, also added images for left and right tongues.

- Added proper call floater positioning relatively to the speak button
2011-10-24 14:17:15 +02:00
Paul ProductEngine 2456573925 EXP-1404 FIXED (Dock icon shown in lower left corner of call dialog when user has speak icon hidden)
- Don't draw tongue of dockable call dialog floater in case speak button is not present in any tool bar.
2011-10-21 19:14:10 +02:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Andrew Dyukov 713417aeeb EXT-5609 FIXED Avoided showing script floater undocked if it was created in mouselook mode.
Commiting on behalf of Alex Productengine.

- Added check if floater is constructed in mouselook mode and added forcing dock state when floater is shown after constructing in mouselook mode.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/830/

--HG--
branch : product-engine
2010-08-02 21:00:02 +03:00
Alexei Arabadji d7945e5d31 implemented EXT-4641 “[BSI] Undocked camera and movement floaters position should persist across the sessions”,
made move and camera floaters save dock state;

--HG--
branch : product-engine
2010-02-24 12:43:27 +02:00
Dmitry Zaporozhan 8c2a6a691a Fixed low bug EXT-5166 - Undocked lldialogs respawn in chiclet tray.
LLDialog floater position is saved per originating object.

--HG--
branch : product-engine
2010-02-12 13:41:34 +02:00
Alexei Arabadji 0508dab523 fixed EXT-3765 “There is no tongue for voice control panel in docked state”,
made dockable floaters have tongue by default;

--HG--
branch : product-engine
2010-01-04 16:18:57 +02:00
Alexei Arabadji 5383fb70c3 Implemented EXT-1627 “Nearby Chat window behavior needs clarification”,
made non-unique docked floaters docks without dock tongue;

--HG--
branch : product-engine
2009-12-26 12:04:55 +02:00
Dmitry Zaporozhan 0312156258 Fixed low bug EXT-3294 - Toasts bunch up in the channel when big docked IM window is opened.
--HG--
branch : product-engine
2009-12-25 13:53:11 +02:00
Dmitry Zaporozhan e6210e82d3 Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking.
Improved functionality, cleaned code.

--HG--
branch : product-engine
2009-12-08 12:17:10 +02:00
Alexei Arabadji 215b95eb64 related to EXT-2515 "Docked floaters should be resizeable"
avoid undock floater when resize initiated not by user

--HG--
branch : product-engine
2009-11-18 11:35:11 +02:00
Alexei Arabadji d43e33400a implemented EXT-2515 "Docked floaters should be resizeable";
--HG--
branch : product-engine
2009-11-17 14:33:07 +02:00
Steven Bennetts 2c1aacf814 Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1609 EXT-1255 EXT-1299
2009-10-21 04:47:55 +00:00
Steven Bennetts 20e56a6925 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00
Steven Bennetts ae0827d387 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1908 https://svn.aws.productengine.com/secondlife/pe/stable-2@1917 -> viewer-2.0.0-3
* Bugs: EXT-1257 EXT-1299 EXT-1149 EXT-1117 EXT-1134
* New Dev: EXT-721
2009-10-07 07:09:34 +00:00
Steven Bennetts 606b381c9f merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
Steven Bennetts 44f294d484 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822
2009-09-10 03:08:54 +00:00
Steven Bennetts 4601aef70a merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09 04:27:06 +00:00
Steven Bennetts 579d8447d3 merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3
* Bugs: EXT-838 EXT-815 EXT-872
* New Dev: IM Floater Docking
2009-09-09 04:12:50 +00:00
Steven Bennetts 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00