Ansariel
|
63151d5c6d
|
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llurlentry.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llvoavatarself.h
|
2023-07-18 00:16:15 +02:00 |
|
Maxim Nikolenko
|
c37140dd89
|
SL-19995 FIXED The context menu is not fully displayed for the navigation bar
|
2023-07-17 18:05:10 +03:00 |
|
Ansariel
|
51cdac3054
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
|
2021-05-31 09:12:27 +02:00 |
|
Beq
|
a1f1fb3ff4
|
[OpenSim] Var Region fixups from Oren @ kitely
|
2021-05-17 20:35:19 +01:00 |
|
Ansariel
|
e0152ecc39
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
|
2021-03-27 11:33:19 +01:00 |
|
Mnikolenko Productengine
|
d43d8bc68b
|
SL-14900 new Landmark creation flow
|
2021-03-23 17:38:22 +02:00 |
|
Ansariel
|
c2f5bd02b1
|
Revert "SL-14050 remove references to viewer-help"
This reverts commit 61e27e0f6c.
|
2020-11-12 01:17:29 +01:00 |
|
Ansariel
|
a0be0371d7
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-11-12 01:12:13 +01:00 |
|
Mnikolenko Productengine
|
61e27e0f6c
|
SL-14050 remove references to viewer-help
|
2020-10-23 21:13:18 +03:00 |
|
Dave Houlton
|
7674c00fb9
|
Merge master (v 6.3.8) into DRTVWR-440
|
2020-02-21 12:05:46 -07:00 |
|
Ansariel
|
da365b227e
|
Merge Firestorm LGPL
|
2019-12-13 18:15:19 +01:00 |
|
Ansariel
|
3bc189bda7
|
Merge Firestorm LGPL
|
2019-11-19 20:28:09 +01:00 |
|
Ansariel
|
0b6b4c7097
|
Merge Firestorm LGPL
|
2019-11-15 19:05:26 +01:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
AndreyL ProductEngine
|
91fa31c065
|
Downstream merge from lindenlab/viewer-serval
|
2019-11-12 04:24:35 +02:00 |
|
Ansariel
|
46f739f348
|
Merge viewer-lynx
|
2019-10-29 18:32:17 +01:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
Mnikolenko Productengine
|
20c21bfcb3
|
SL-12110 FIXED Location bar is corrupted for a parcel if its name begins with empty space
|
2019-10-16 19:40:05 +03:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Ansariel
|
1733550573
|
Merge viewer-eep
|
2018-09-22 00:42:04 +02:00 |
|
Rider Linden
|
b37eb2642f
|
Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local)
|
2017-11-10 16:17:25 -08:00 |
|
Ansariel
|
f0366fa155
|
Merge latest fixes from viewer-vob that didn't get into viewer-release yet
|
2016-09-15 23:32:34 +02:00 |
|
andreykproductengine
|
da23e0f925
|
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
|
2016-09-13 20:32:34 +03:00 |
|
andreykproductengine
|
a195406e48
|
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
|
2016-09-13 20:32:34 +03:00 |
|
Ansariel
|
f68896905b
|
Merge Firestorm LGPL
|
2016-05-23 16:09:09 +02:00 |
|
AndreyL ProductEngine
|
b25a22a2c1
|
Merged in lindenlab/viewer-release
|
2016-05-19 23:02:37 +03:00 |
|
Ansariel
|
2889c5bf40
|
Merge viewer-bear
|
2016-05-09 17:24:00 +02:00 |
|
AndreyL ProductEngine
|
af408181c1
|
MAINT-6248 remove the 'OK' and place a 'Rebake region' button in "pending pathfinding changes" notification toast
|
2016-04-14 02:10:21 +03:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Ansariel
|
d58d2e2c20
|
Consolidate check for standalone place details floater into FSFloaterPlaceDetails
|
2016-02-04 11:41:57 +01:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Ansariel
|
5fe09cb64d
|
Merge Viewer-Bear
|
2015-08-22 03:13:17 +02:00 |
|
Mnikolenko ProductEngine
|
b5bedce5c2
|
MAINT-23 reverted
|
2015-07-02 15:44:08 +03:00 |
|
Ansariel
|
2208ee2f88
|
Undo MAIN-23 for now and show global parcel perms again
|
2015-06-20 17:00:07 +02:00 |
|
Ansariel
|
a45d3d8421
|
Merge Viewer-Bear
|
2015-06-20 15:35:15 +02:00 |
|
Mnikolenko ProductEngine
|
58788eae32
|
MAINT-23 FIXED Don't display icon if user is parcel owner or user is in group which has rights to build/modify objects.
|
2015-01-26 11:18:47 +02:00 |
|
Ansariel
|
f4bfb1aadf
|
Merge LL V3.7.9 (AIS3 + SSA)
|
2014-10-22 02:02:08 +02:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Tank_Master
|
6babf8abd2
|
Merge LL 3.7.7
|
2014-06-09 11:29:57 -07:00 |
|
Richard Linden
|
5866bb7ef0
|
merge with release
|
2014-02-12 10:32:02 -08:00 |
|
Brad Payne (Vir Linden)
|
969cb45920
|
merge
|
2014-02-11 16:04:31 -05:00 |
|
Tank_Master
|
7b2cc02863
|
Merge LL fitted mesh
|
2014-02-06 00:41:33 -08:00 |
|
Brad Payne (Vir Linden)
|
f6947e9ce5
|
SH-4664 WIP - updated from from UpdateCreateInventoryItem to inventory observers.
|
2013-12-19 15:39:21 -05:00 |
|
Oz Linden
|
6bd777214c
|
add callbacks to LLAgent for Region and Parcel changes
|
2013-11-18 19:05:34 -05:00 |
|
Brad Payne (Vir Linden)
|
19cebb8a29
|
SH-4595 WIP
|
2013-11-06 17:21:11 -05:00 |
|
Brad Payne (Vir Linden)
|
e26268add0
|
SH-4595 WIP - reworked descendents of LLInventoryAddedObserver to use gInventory.getAddedIDs(). LLInventoryAddedObserver isn't really needed anymore, but leaving it in as a debugging point at least for now.
|
2013-11-01 11:02:51 -04:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07:00 |