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
Ansariel	5f1a19af72	Merge remote-tracking branch 'LL/marchcat/x-ws-merge' ... # Conflicts: # autobuild.xml # indra/linux_crash_logger/llcrashloggerlinux.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llcallbacklist.cpp # indra/newview/llimpanel.h	2024-05-01 12:30:57 +02:00
Ansariel	b71c7f37ea	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llagent.cpp # indra/newview/llagent.h # indra/newview/llagentcamera.cpp # indra/newview/llagentcamera.h # indra/newview/llappviewer.cpp # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llattachmentsmgr.cpp # indra/newview/llattachmentsmgr.h # indra/newview/llavataractions.cpp # indra/newview/llcallingcard.cpp # indra/newview/llcompilequeue.cpp # indra/newview/llcontrolavatar.h # indra/newview/lldirpicker.cpp # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolalpha.h # indra/newview/lldrawpoolavatar.h # indra/newview/lldynamictexture.cpp # indra/newview/llfasttimerview.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfloateravatarpicker.cpp # indra/newview/llfloaterbeacons.cpp # indra/newview/llfloaterbvhpreview.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llfloaterdisplayname.cpp # indra/newview/llfloatergotoline.cpp # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterland.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreferencesgraphicsadvanced.cpp # indra/newview/llfloaterscriptdebug.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersnapshot.cpp # indra/newview/llfloatertools.cpp # indra/newview/llfloatertools.h # indra/newview/llfloateruipreview.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgesturemgr.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llglsandbox.cpp # indra/newview/llgroupactions.cpp # indra/newview/llhudeffectlookat.cpp # indra/newview/llhudeffectlookat.h # indra/newview/llhudicon.cpp # indra/newview/llhudmanager.cpp # indra/newview/llhudtext.cpp # indra/newview/llhudtext.h # indra/newview/llimprocessing.cpp # indra/newview/llimview.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodel.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/lllocalbitmaps.cpp # indra/newview/lllogininstance.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llmodelpreview.h # indra/newview/llmutelist.cpp # indra/newview/llnavigationbar.cpp # indra/newview/llnavigationbar.h # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h # indra/newview/llnotificationlistitem.cpp # indra/newview/lloutputmonitorctrl.cpp # indra/newview/llpanelcontents.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelexperiencepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelgroup.cpp # indra/newview/llpanelgroupnotices.cpp # indra/newview/llpanelgrouproles.cpp # indra/newview/llpanellandaudio.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelobject.cpp # indra/newview/llpanelobject.h # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelplaces.cpp # indra/newview/llpanelpresetspulldown.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelsnapshot.h # indra/newview/llpanelvolume.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewgesture.cpp # indra/newview/llpreviewnotecard.cpp # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llpreviewtexture.cpp # indra/newview/llpreviewtexture.h # indra/newview/llselectmgr.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsnapshotlivepreview.cpp # indra/newview/llstartup.cpp # indra/newview/llstatusbar.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturecache.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltoastimpanel.cpp # indra/newview/lltoolbarview.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/lltoolface.cpp # indra/newview/lltoolfocus.cpp # indra/newview/lltoolgrab.cpp # indra/newview/lltoolgun.cpp # indra/newview/lltoolgun.h # indra/newview/lltoolpie.cpp # indra/newview/lltoolplacer.cpp # indra/newview/lltoolselect.cpp # indra/newview/lluploaddialog.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llvieweraudio.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewerfoldertype.cpp # indra/newview/llviewerinput.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewermenu.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewerobject.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewerobjectlist.h # indra/newview/llviewerparcelmgr.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerregion.h # indra/newview/llviewershadermgr.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexlayer.h # indra/newview/llviewertexture.cpp # indra/newview/llviewertexture.h # indra/newview/llviewertexturelist.h # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvoavatarself.h # indra/newview/llvoiceclient.h # indra/newview/llvosky.cpp # indra/newview/llvosurfacepatch.cpp # indra/newview/llvotree.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/llvowater.cpp # indra/newview/llworld.cpp # indra/newview/llworldmapview.cpp # indra/newview/llworldmipmap.cpp # indra/newview/pipeline.cpp	2024-02-22 11:43:04 +01:00
Ansariel	314639426d	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llchat.h # indra/llui/llcombobox.cpp # indra/llui/llcontainerview.h # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/llfolderview.cpp # indra/llui/lllineeditor.cpp # indra/llui/llmenugl.cpp # indra/llui/llmultifloater.cpp # indra/llui/llmultifloater.h # indra/llui/llscrolllistctrl.cpp # indra/llui/llscrolllistctrl.h # indra/llui/llspinctrl.cpp # indra/llui/llspinctrl.h # indra/llui/lltabcontainer.cpp # indra/llui/lltabcontainer.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llui/llview.h # indra/llui/llviewereventrecorder.cpp # indra/llxml/llcontrol.cpp # indra/llxml/llcontrol.h # indra/newview/llagentlanguage.cpp # indra/newview/llappviewer.cpp # indra/newview/llavatarlistitem.cpp # indra/newview/llavatarlistitem.h # indra/newview/llchatitemscontainerctrl.cpp # indra/newview/llchicletbar.cpp # indra/newview/llfloaterbuildoptions.cpp # indra/newview/llfloaterbuildoptions.h # indra/newview/llfloaterbump.cpp # indra/newview/llfloaterbump.h # indra/newview/llfloaterconversationpreview.h # indra/newview/llfloaterdestinations.h # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterjoystick.cpp # indra/newview/llfloaterland.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llfloaterpay.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreference.h # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterscriptdebug.cpp # indra/newview/llfloaterscriptdebug.h # indra/newview/llfloaterscriptedprefs.cpp # indra/newview/llfloatersearch.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatertools.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llmediactrl.h # indra/newview/llmoveview.cpp # indra/newview/llnavigationbar.cpp # indra/newview/llnavigationbar.h # indra/newview/llnetmap.cpp # indra/newview/llnotificationlistitem.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelgroup.cpp # indra/newview/llpanelgroupnotices.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llpanelobject.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelpeople.h # indra/newview/llpanelpermissions.h # indra/newview/llpanelprofileclassifieds.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelsnapshot.h # indra/newview/llpanelsnapshotinventory.cpp # indra/newview/llpanelsnapshotlocal.cpp # indra/newview/llpanelsnapshotpostcard.cpp # indra/newview/llpreviewnotecard.h # indra/newview/llstartup.cpp # indra/newview/llstatusbar.cpp # indra/newview/llstatusbar.h # indra/newview/llsyswellwindow.h # indra/newview/lltexturectrl.h # indra/newview/lltoolbarview.cpp # indra/newview/lltoolselect.cpp # indra/newview/llwearableitemslist.cpp	2024-02-21 13:07:42 +01:00
Ansariel	c6ac9beb04	Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/newview/llpanelprofile.cpp # indra/newview/llstartup.cpp # indra/newview/llviewerfloaterreg.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/en/panel_edit_classified.xml # indra/newview/skins/default/xui/en/panel_edit_pick.xml # indra/newview/skins/default/xui/en/panel_pick_info.xml # indra/newview/skins/default/xui/en/panel_profile_secondlife.xml	2022-06-03 11:40:46 +02:00
Ansariel	51cdac3054	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm	2021-05-31 09:12:27 +02:00
Beq	71eb75382e	Further VarRegion slurl updates and fixes	2021-05-17 20:35:19 +01:00
Ansariel	768a31906a	Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer	2021-02-09 21:08:57 +01:00
Ansariel	32f05624a1	FIRE-21863: Prevent circumventing TP restrictions via "parcel" SLURL	2018-06-17 11:53:36 +02:00
Ansariel	856f060d0a	FIRE-19799: Place details window keeps 'Loading...' estate information	2016-08-12 13:04:50 +02:00
Ansariel	ee91070330	Possible crash fix in LLPanelPlaceInfo::displayParcelInfo	2016-04-28 11:32:39 +02:00
Ansariel	d58d2e2c20	Consolidate check for standalone place details floater into FSFloaterPlaceDetails	2016-02-04 11:41:57 +01:00
Ansariel	f4bfb1aadf	Merge LL V3.7.9 (AIS3 + SSA)	2014-10-22 02:02:08 +02:00
Ansariel	b609970d4f	FIRE-14646: When clicking on a SLURL, location text in place details is incorrect if standalone place details floater is used	2014-09-20 21:43:54 +02:00
Ansariel	036c9dd89f	Init FS_PLACE_INFO_UPDATE_INTERVAL with an F32	2014-08-19 16:55:38 +02:00
Tank_Master	8863d9beaf	Compile fixes	2014-06-09 23:27:05 -07:00
Tank_Master	7b2cc02863	Merge LL fitted mesh	2014-02-06 00:41:33 -08:00
Cinders	ebb55cdd8d	Make sure we have a panel	2013-11-17 12:16:31 -07:00
Ansariel	7abcf40dec	Fixed some Firestorm license headers	2013-03-06 14:07:56 +01:00
Ansariel	654b6b4175	FIRE-817: Remove ugly unused space of back-button in standalone LM/place details floater	2013-02-06 14:35:02 +01:00
Ansariel	9befa3ce66	Update button state at correct location for LM floater	2012-12-12 21:10:43 +01:00
Ansariel	2ab24c0d11	Fix for wrong "For Sale" icon being shown	2012-12-07 17:31:16 +01:00
Ansariel	3635d30198	FIRE-817: Also made agent location separate floater	2012-12-07 12:03:28 +01:00
Ansariel	1262f40356	FIRE-816/FIRE-817: Some experimental UI improvements	2012-12-03 11:06:14 +01:00