Age | Commit message (Collapse) | Author | |
---|---|---|---|
2024-05-01 | Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge | Andrey Lihatskiy | |
2024-04-29 | #824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵ | Andrey Lihatskiy | |
LF, and trim trailing whitespaces as needed | |||
2023-11-30 | Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge | Andrey Lihatskiy | |
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml | |||
2023-10-03 | Merge branch 'main' into DRTVWR-591-maint-X | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventorybridge.cpp # indra/newview/lltexturectrl.h # indra/newview/llvovolume.cpp | |||
2023-10-03 | Merge branch 'main' (DRTVWR-567) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml | |||
2023-10-02 | SL-20367 Switch from index to value based selection | Andrey Kleshchev | |
To make sure it won't happen again once new option gets added | |||
2023-10-02 | SL-20367 Click actions Zoom and Ignore can't be set from object's profile | Andrey Kleshchev | |
2023-08-30 | SL-20242 UI overlap in object profile with DebugPermissions on | Andrey Kleshchev | |
2023-08-23 | Merge branch main (DRTVWR-582) into DRTVWR-567 | Andrey Kleshchev | |
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml | |||
2023-08-23 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-07-11 | SL-19728 Objects that cannot be clicked or cammed unless in edit mode | Alexander Gavriliuk | |
2023-02-04 | SL-19109 Turn LLSidepanelTaskInfo into a normal panel | Andrey Kleshchev | |
2022-10-26 | SL-18444 Live Material Editor updating with selection | Andrey Kleshchev | |
2019-07-08 | SL-11472 Checkboxes continue to change their state after clicking is stopped ↵ | andreykproductengine | |
in the "Item profile" menu | |||
2018-06-13 | MAINT-8731 Click action to disable clicking objects, per-object in a linkset | andreykproductengine | |
2018-05-08 | MAINT-8586 XUI cleanup | Andrey Kleshchev | |
2016-03-16 | merge changes for DRTVWR-417 | Oz Linden | |
2015-12-17 | MAINT-5971 FIXED Creator and Owner are missing in Object profile | Mnikolenko ProductEngine | |
2015-11-10 | remove execute permission from many files that should not have it | Oz Linden | |
2015-07-08 | MAINT-1412 FIXED Don't update creator/owner name if it stays the same. | Mnikolenko ProductEngine | |
2014-11-26 | MAINT-4691 FIXED Changed text labels | Mnikolenko ProductEngine | |
2014-11-25 | MAINT-4691 Restored price labels in Object profile panel | Mnikolenko ProductEngine | |
2014-03-12 | merge with release | Richard Linden | |
2014-02-05 | MAINT-3555 crash in LLPanel::~LLPanel() on shutdown: | maksymsproductengine | |
- memory leaks fixing; | |||
2013-11-11 | Automated merge with http://bitbucket.org/lindenlab/viewer-release | Richard Linden | |
2013-08-12 | MAINT-2175 FIXED 'Pay Resident' floater is not opened after clicking on ↵ | dmitrykproductengine | |
'Pay' button in Object profile | |||
2013-08-09 | second phase summer cleaning | Richard Linden | |
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc. | |||
2013-06-05 | merge with viewer-release | Richard Linden | |
2013-05-10 | SH-3931 WIP Interesting: Add graphs to visualize scene load metrics | Richard Linden | |
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors | |||
2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2013-03-22 | merge with viewer-release | Richard Linden | |
2013-01-24 | merging in viewer-beta. | Nyx Linden | |
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. | |||
2012-10-17 | SH-3405 WIP convert existing stats to lltrace system | Richard Linden | |
started conversion of llviewerassetstats removed old, dead LLViewerStats code made units tracing require units declaration clean up of units handling | |||
2012-10-11 | Updating linux build to gcc4.6 | Don Kjer | |
2012-09-11 | MAINT-1534 Fix for calls to find widgets getting out of hand. | Dave Parks | |
2012-07-05 | Adding the pathfinding attributes to the object profile panel. | Todd Stinson | |
2012-06-22 | Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. | Todd Stinson | |
2012-06-21 | PATH-760: Ensuring that the pathfinding attribute field works correctly with ↵ | Todd Stinson | |
multiple objects selected. | |||
2012-06-21 | PATH-760: Renaming some methods of LLSelectMgr. | Todd Stinson | |
2012-06-13 | PATH-713: Disabling all editable object fields on the build tools floater ↵ | Todd Stinson | |
when a static pathfinding object is in not in the current region. | |||
2012-03-29 | PATH-450: BUGFIX Ensuring that permanent objects cannot be linked in frozen ↵ | Todd Stinson | |
mode. Displaying a modal notification if user attempts. | |||
2012-03-20 | MAINT-789 FIXED ([PUBLIC]Button "Buy" isn't work in Object profile) | Paul ProductEngine | |
- Set proper callback for buy button - Removed dead code - Fixed values for action combobox in object profile panel | |||
2011-11-23 | SH-2710 FIX -- Removed calls to getChild happening every frame and during ↵ | Leslie Linden | |
idle calls. Reviewed by davep. | |||
2010-12-23 | STORM-812 Make bottom buttons in Object Profile identical for single and ↵ | Jonathan Yap | |
multi-prim objects | |||
2010-09-03 | Post-convert merge by convert_monolith.py from ↵ | Aimee Linden | |
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution | |||
2010-09-03 | Merge between james/viewer-identity-evolution and dessie/viewer-public | Aimee Linden | |
2010-08-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
back-out the back-out for this branch. yay. | |||
2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
Backing out this merge that I pushed (prematurely) to the wrong place. | |||
2010-08-24 | merge heads. whew. | Tofu Linden | |