Commit Graph

24 Commits (a9b52b1f73669c2f97e119a18b299a161f8cf67d)

Author SHA1 Message Date
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 c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
Nicky 30dcad4b95 Windows: 1. GWL_USERDATA must be GWLP_USERDATA to be compatible with x86 and x64. (GWL_USERDATA is deprecated anyway). 3. Replace Get/SetWindowLong with Get/SetWindoeLongPtr or placing this into GWLP_USERDATA will truncate the pointer.
(transplanted from 5f50745bff03700d3862a6bb1eb5936be0fdc6cd)
2016-04-22 14:55:19 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 4e08461f8a EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden bbfc0e4719 CID 424
Checker: UNINIT_CTOR
Function: LLDragDropWin32Target::LLDragDropWin32Target(HWND__ *)
File: /indra/llwindow/lldragdropwin32.cpp
2010-02-10 16:52:26 +00:00
Rick Pasetto 9430b8de65 dos2unix these files 2010-02-01 16:29:52 -08:00
Callum Prentice e57f6a5cee Fix drag and drop for windows. Makes Win32 state machine behave more like Mac. 2010-01-07 14:21:57 -08:00
Rick Pasetto 4c33c54ce0 Fix windows build to now use DragNDropAction instead of a bool 'drop' 2009-12-03 19:02:12 -08:00
Rick Pasetto ff53d4ff9b Fix Windows build based on API change to handleDragNDrop() 2009-12-03 12:19:02 -08:00
callum e2e7d544b6 Added support for dropping SURLs onto viewer
Does right thing when logged in - needs some work at login page
Removed (commented out) WM_DROPFILES code for now
2009-11-24 20:20:53 -08:00
callum 8d84b7ae40 Add support for changing OS cursor when mouse passes
over a prim you can drop on versus one you can't.
2009-11-24 18:31:30 -08:00
Rick Pasetto 0627d550f3 Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/ 2009-11-19 09:29:08 -08:00
Rick Pasetto d4ba73ed72 Fix merge error 2009-11-19 09:24:26 -08:00
callum 4419e367bc Add support for removing the Windows specific drag/drop code
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-18 21:15:44 -08:00
Rick Pasetto 522651f208 Merge with remote 2009-11-18 11:34:15 -08:00
callum 778005a350 Reworked IDropTarget COM interface impl - now much cleaner and doesn't crash! 2009-11-13 17:43:55 -08:00
Rick Pasetto bf5ce0fcbd Change 'handleDrop()' API to 'handleDragNDrop', which now takes a "drop" BOOL 2009-11-12 11:06:29 -08:00
callum 996740607a Convert screen coordinates from IDropAction to window coordinates. 2009-11-03 09:33:21 -08:00
callum caa631bf5b Added IDropTarget interface. Still lots of cleanup but this works ok.
You can drag over from Firefox or IE onto a prim
2009-10-27 17:52:04 -07:00