Ansariel
|
affda233ba
|
Remove unnecessary distinction for physics lib again after Havok lib has been updated
|
2024-08-06 15:05:16 +02:00 |
|
Ansariel
|
4969c9a819
|
Unhackerish hackery workaround for easier merge cleanup
|
2024-07-30 15:49:52 +02:00 |
|
Beq
|
5a50d6e5d6
|
More temporary BOOL hackery until we get a new lib
|
2024-07-19 15:57:34 +01:00 |
|
Ansariel
|
955e5c6cb4
|
Make this thing build
|
2024-07-19 10:07:36 +02:00 |
|
Ansariel
|
a17fd2352a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
|
2024-06-09 16:11:24 +02:00 |
|
Ansariel
|
c082f6f67a
|
Re-enable compiler warning C4800 (performance warning)
|
2024-05-30 13:11:50 +02:00 |
|
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 |
|
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 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
callum_linden
|
23711c9275
|
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
|
2014-12-10 08:44:08 -08: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
|
b8cca9c6e6
|
Adding a group identifier to the group objects in the pathfinding linksets and characters floaters.
|
2012-07-24 17:50:24 -07:00 |
|
Todd Stinson
|
9366a7775c
|
PATH-797: BUGFIX Altering how the rows are being added to the scrolllist widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally.
|
2012-06-29 17:36:40 -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
|
ce10117295
|
PATH-718: Ensuring that the characters panel will work correctly with a stubbed physicsextension library.
|
2012-06-25 18:02:41 -07:00 |
|
Todd Stinson
|
b6d42e0b62
|
PATH-783: Ensuring that the pathfinding console and pathfinding characters floaters cannot be created through getInstanceHandle().
|
2012-06-25 16:41:12 -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
|
f5949aaba9
|
PATH-738: Removing SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE ifdef.
|
2012-06-20 12:34:16 -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 |
|
prep
|
1850968326
|
Physics capsules now inherit the rotations of their parent vo when rendered. API update.
|
2012-06-07 11:00:58 -04:00 |
|
Todd Stinson
|
a48ee0e86a
|
BUGFIX: Correcting an assert behavior where the LLSD returned from calls to convertObjectsIntoScrollListData() should be required to be an array type.
|
2012-06-05 18:32:19 -07:00 |
|
Todd Stinson
|
546c2583af
|
Altering the method name.
|
2012-06-05 15:35:12 -07:00 |
|
Todd Stinson
|
9d615c1e1d
|
BUGFIX: Ensuring that the viewer will still work on regions that have older pathfinding server code with the character shape data.
|
2012-06-04 18:08:46 -07:00 |
|
Todd Stinson
|
b64700913f
|
PATH-676: Correcting selection behavior so that the first selected object does remain invisible after changing the selection.
|
2012-06-04 17:29:48 -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
|
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 |
|
Todd Stinson
|
852377c676
|
Switching the functionality of the linksets and character request handling to no longer return values directly, but rather to report status only through the callbacks.
|
2012-05-01 14:22:58 -07:00 |
|
Todd Stinson
|
cbebd682f7
|
Removing windows line endings from .h and .cpp files.
|
2012-04-25 13:04:13 -07:00 |
|
Todd Stinson
|
8d9863f4ef
|
Altering the layout of the pathfinding console based on feedback.
|
2012-04-06 13:37:11 -07:00 |
|
Todd Stinson
|
9d22b22d96
|
PATH-482: BUGFIX Automatically reloading the character and linksets floaters on region crossing.
|
2012-04-05 15:59:34 -07:00 |
|
Todd Stinson
|
473da43c1b
|
Refactoring the characters floater code.
|
2012-03-27 19:05:29 -07:00 |
|
Todd Stinson
|
6fb42d7ae8
|
PATH-349: BUGFIX Incorrect ordering of CPU time was only occurring in the case that the number of digitis in one of the CPU times exceeded 3 digits. In this scenario, the thousands comma was being inserted, and this comma was disrupting the comparison method. This fix is simply to use the standard integer formatting rather that the locale specific one.
|
2012-03-08 18:01:40 -08:00 |
|
Todd Stinson
|
2b93f44f19
|
BUGFIX Correcting a problem with the object selection code in the pathfinding characters and linksets floaters. The code was not seeing the callback from the object update message of the selection manager.
|
2012-03-01 16:04:18 -08:00 |
|
Todd Stinson
|
35b09a722e
|
PATH-310: Switching the cpu time display from milliseconds to microseconds to properly indicate the correct values.
|
2012-02-17 11:37:49 -08:00 |
|
Todd Stinson
|
9181229b34
|
Updating the pathfinding character initialization to match the new data type for CPU time.
|
2012-02-13 18:39:41 -08:00 |
|
Todd Stinson
|
76959fdb45
|
PATH-284: Hooking up the characters button to open the characters floater.
|
2012-02-13 18:32:06 -08:00 |
|
Todd Stinson
|
e88ed1164a
|
PATH-245: Adding functionality for returning objects to owner from the characters floater.
|
2012-02-10 13:37:37 -08:00 |
|
Todd Stinson
|
50ba8b4ac1
|
PATH-245: Adding initial functionality for rendering debug beacons for selected pathfinding characters.
|
2012-02-09 18:40:23 -08:00 |
|
Todd Stinson
|
3a9f437fdf
|
PATH-245: Adding proper toggling of the enabled state for the take, take copy, and delete buttons.
|
2012-02-09 17:02:16 -08:00 |