Commit Graph

24 Commits (master)

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 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
Mnikolenko Productengine 9779917899 MAINT-1689 The object that was created after opening Linkset is not presented in linkset list 2017-01-16 11:26:10 +02: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
Todd Stinson fddaf38f89 PATH-849: Group objects were losing their [group] identifier following the last commit. This should fix that issue. 2012-08-14 16:04:12 -07:00
Todd Stinson 683a96a5f1 PATH-849: Refactoring the behavior after loading the owner name of a pathfinding object into the avatar name cache so that each object can simply update its respective row in the scroll list rather than rebuilding from scratch after all names are loaded. 2012-08-14 14:54:29 -07:00
Todd Stinson 685a672b74 Cleaning up new files in preparation for merge into viewer-release. 2012-06-28 15:37:55 -07:00
Todd Stinson 78910cf301 Updating the header licensing comments. 2012-06-26 18:04:19 -07:00
Todd Stinson bf86a69731 PATH-717: Minor UI changes from Leo. Also, adding a notification when attempting to return or delete multiple items. 2012-06-25 15:37:18 -07:00
Todd Stinson 328322436c PATH-764,PATH-765: Adding in a context menu option on right-click of an object to show in the linksets floater if all objects are non-characters, or to show in the characters floater if all objects are characters. 2012-06-22 16:12:32 -07:00
Todd Stinson e78266e937 BUGFIX: Correcting a behavior where moving the cursor over a selected object inappropriately called updateControls(). Fix was to break the updateControl() functionality into two separate handlers updateControlsOnScrollListChange() and updateControlsOnInWorldSelectionChange(). 2012-06-15 12:45:41 -07:00
Todd Stinson e85909aa9b Some class refactoring. 2012-06-04 16:22:01 -07:00
Todd Stinson ea23285f8b Ensuring that the scroll list is rebuilt after any missing avatar names are loaded into cache. 2012-06-04 14:36:43 -07:00
prep bf8d3e1d30 Migrated restoration of physics capsule into pathing character 2012-06-01 16:02:12 -04:00
prep a8ff37b956 Migrated physics capsule logic into pathing character object 2012-06-01 15:48:19 -04:00
Todd Stinson fc1dd55833 Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai. 2012-05-31 18:07:11 -07:00
Todd Stinson 41bcd56764 A bit more class clean-up for the LLFloaterPathfindingObjects. 2012-05-31 17:25:41 -07:00
prep ef75a2e07e WIP:Displaying physics capsule for a character - it is currently disabled. 2012-05-31 16:38:19 -04:00
Todd Stinson 938f42ded7 Reloading the the pathfinding object floaters when the god level is changed. 2012-05-31 12:22:47 -07:00
Todd Stinson 3352a1eac1 Cleaning up some unreferenced headers and classes definitions from previous refactoring. 2012-05-30 19:39:08 -07:00
Todd Stinson 3c2be426e5 First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated. 2012-05-30 18:47:12 -07:00