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
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
aa2c08836b
FIRE-31033: Keep Teleport/Map/Profile buttons on places floater
2021-06-29 13:57:36 +02:00
51cdac3054
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-05-31 09:12:27 +02:00
a1f1fb3ff4
[OpenSim] Var Region fixups from Oren @ kitely
2021-05-17 20:35:19 +01:00
70bc98c4b0
SL-15144 FIXED The "Remove" button is enabled with no selection
2021-04-23 14:56:01 +03:00
554ccd7181
SL-14842 Apply toolstrip layout to Places floater Part #3
...
Removed unused buttons, moved some UI elements to be more in line with each other
2021-02-24 23:13:44 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
8d8f167a4e
automated merge with trunk
2010-04-19 16:24:05 -07:00
66b3fbf176
Fixed major bug EXT-6605 (No profile verb button on Places panel)
...
- Added functionality of showing place profile to the LLPanelPlacesTab hierarchy. Use this functionality from LLPanelPlaces as callback for profile button click.
Reviewed my Mike Antipov at https://codereview.productengine.com/secondlife/r/191/
--HG--
branch : product-engine
2010-04-08 08:06:40 +03: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
7a64aad1de
DEV-34822 - merge 1.23
...
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00
56504054d8
Fixed normal bug EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders".
...
- Added updating accordions contents in idle routine.
- Removed inventory observer.
--HG--
branch : product-engine
2009-12-01 20:25:01 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
8346cd6806
Fixed normal bug EXT-2192 "Remove "Share" button from all Places Tabs (including Place/Landmark info)".
...
- Removed "Share" button and resized other buttons to take its place.
--HG--
branch : product-engine
2009-11-04 19:53:17 +02:00
380bb0ce09
No ticket. Removed extra includes. Fixed copyright years.
...
--HG--
branch : product-engine
2009-11-04 15:24:11 +02:00
e97f7728a9
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-30 23:22:41 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
39905b927d
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
2009-07-02 00:38:13 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Ansariel