2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
c9ba8f1fce
SL-19109 Decouple object profiles from inventory
...
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03 23:56:35 +02:00
1fbfe48f84
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 18:23:17 +02:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
b96348a2f9
SL-16098 Unable to sit on an object using the 'Object inspector' floater
...
The same should probably be done for onClickTouch
2021-09-28 19:50:27 +03:00
f83ada32f7
Merged in lindenlab/viewer-release
2019-11-13 10:50:25 +02:00
229a6928e9
Merge Firestorm LGPL
2019-11-12 23:22:39 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
56da70fa96
Merge viewer-legacy-profiles
2019-10-18 18:32:42 +02:00
c7e9bbc20e
SL-11957 FIXED The Mini-inspector changes position when clicking on the 'View full profile' link
2019-09-24 16:37:15 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
8369276a49
DRTVWR-493 LLViewerMedia to singleton
2019-06-21 20:55:39 +03:00
b233db99fe
[FIXED] Edge case issues with @fartouch and other touch related restrictions
...
-> [FIXED] Can't select a face on a nearby object when both @fartouch and @touch* restricted
-> [FIXED] Object inspectors aren't shown on nearby objects when both @fartouch and @touch* restricted
-> [FIXED] Non-touch left-click actions on nearby objects are blocked when both @fartouch and @touch* restricted
--HG--
branch : RLVa
2016-11-20 15:10:42 +01:00
7dac084924
Refactoring carousel: prefer RlvActions over RlvHandler wherever possible
...
-> RlvHandler should only deal with the actual RLV API syntax
-> RlvActions should handle all interpretation of the stored behaviour
=> the end result will make it significantly easier to finally switch over to a new syntax with the option of remaining compatible
--HG--
branch : RLVa
2016-11-20 00:46:12 +01:00
0046a76489
Merged with default tip (Revision 353c4cb529e2)
...
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
4b884caf43
Added @shownames:<uuid> and @shownametags:<uuid> exceptions
...
-> [FIXED] "Pay" isn't disabled on the avatar context menu when @shownames restricted
-> [CHANGED] Show a notification when the user can't offer a teleport due to an RLV restriction
--HG--
branch : RLVa
2016-06-11 22:45:42 +02:00
d36c0de9e6
Added variable sittp/tplocal distances (@sittp[:<dist>]=n|y and @tplocal[:<dist>]=n|y)
...
--HG--
branch : RLVa
2016-06-04 13:50:58 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
839fe0fa12
Merged with default tip (Revision ffde74743e89)
...
--HG--
branch : RLVa
2015-05-09 00:53:24 +02:00
f0db860b8a
MAINT-1789 FIXED Object inspector doesn't show any information about object if user uses Select Only My Objects option
2014-11-18 17:22:02 +02:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
9c395aa0c6
Merged with default tip (Revision f958326781de)
...
--HG--
branch : RLVa
2012-07-16 01:01:09 +02:00
aa4ccff19f
MAINT-261 FIXED Display previously retrieved data (until we get the update) if object inspector is invoked for the same object.
2012-03-19 16:44:50 +02:00
866eeb7897
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
0ff49e798c
EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
...
* Removed old inventory panel.
* Renamed new inventory panel from "my_inventory" to "inventory"
Reviewed by Richard.
2011-10-17 15:18:19 -07:00
9d3fc5d930
EXP-1209 FIXED Sidetray removed.
...
- Removed all sidetray dependencies and the sidetray itself.
- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
0f3221e25d
EXP-1225 FIXED Added a floater for My Inventory side tab.
...
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
- Added LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.
2011-09-27 21:05:05 +03:00
f33952a262
Merged with RLVa-1.2.1 tip
...
--HG--
branch : RLVa
2010-11-12 15:27:05 +01:00
a870429974
- fixed : "Touch" button isn't visually disabled on the object inspector
...
--HG--
branch : RLVa
2010-11-12 15:04:28 +01:00
6cad3862dd
- merge : anonymize names on the object inspector when @shownames=n restricted
...
--HG--
branch : RLVa
2010-11-02 18:15:42 +01:00
9caae12457
- review : fixed spelling of "anonymize*" (blame Arrehn)
...
--HG--
branch : RLVa
2010-11-01 02:11:31 +01:00
9498c31d3c
Merged with default tip (Revision aeb7e6c38341)
...
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
54da19fdcf
STORM-426 FIXED Menu button no longer looked pressed while its menu is displayed by another control.
...
- LLMenuGL in menu button replaced by LLToggleableMenu that handles visibility change upon clicks inside specific button rect.
- Added visibility change signal to LLToggleableMenu to update menu button pressed state.
- Added using menu handle in LLMenuButton.
2010-10-22 02:08:26 +03:00
33997d0695
- internal : moved several rlvXXX helper and RlvHandler member functions into an RlvUtil helper class
...
--HG--
branch : RLVa
2010-08-29 04:00:55 +02:00
5a834cabd1
- fixed : object owner name isn't anonimized when @shownames=n restricted
...
-> fixed on the Edit floater
-> fixed on the "Object Profile" sidebar panel
-> fixed on the object inspector
- changed : anonimize object creator name when @shownames=n restricted if object owner matches object creator, or if the creator is a nearby agent
-> we're not obscuring the profile thumbnail so leaving the name untouched means the anonym could be matched to the actual avie name
--HG--
branch : RLVa
2010-08-25 04:54:50 +02:00
b6a073c659
Initial commit of RLVa-1.2.0i
...
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
1f79bee86e
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
...
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
2010-07-09 14:26:56 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
5352954eb6
automated merge
2010-02-26 17:34:39 -08:00
13d4257868
automated merge
2010-02-26 12:02:34 -08:00
13aa8f8faa
EXT-4344 : Object Inspector has "Sorry, not implemented yet"
...
Added sidetray object inspector code.
2010-02-03 21:27:02 -05:00
38315a063d
Fixed normal bug EXT-4740 - Object inspector hides however context menu present
...
--HG--
branch : product-engine
2010-02-02 14:25:31 +02:00
a1e342b3f7
merge
2010-01-06 12:40:44 -08:00
7586d8fcfd
fix for EXT-2903 ([BSI] Activating inspector while "Zoomed into Media" results in broken inspector)
...
Media Focus and the inspector were fighting over the object selection.
Fixed by calling LLViewerMediaFocus::clearFocus() right before setting the selection in LLInspectObject::onOpen().
2010-01-06 12:01:39 -08:00
Ansariel