c12c377c61
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2023-10-01 18:18:17 +02:00
b49632f427
SL-20343 Close material live editor if editor floater closes
...
Closing tools floater disabled selection, material editor can't work without that
2023-09-28 03:55:43 +03:00
2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
cc7cfeb2b5
Comment out some unnecessary code
2022-08-13 15:56:50 +02:00
9afc002e53
Restore remaining capacity info in tools floater
2022-08-13 15:53:31 +02:00
6d09c9ff89
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 12:37:05 +02:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
d5501d459b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-01 11:36:10 +02:00
9f5a38b98e
SL-17562 FIXED Grid Options changes position upon reopening of Build Window
2022-06-16 19:40:33 +03:00
7001a372bf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-02 12:05:22 +01:00
55730e72f9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-26 11:38:59 +01:00
43944a6fbc
Fix wrong check
2022-01-22 11:30:47 +01:00
f9523df2c0
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-18 15:54:45 +01:00
8ea7867528
SL-16344 #3 Moved LLPanelFace related code into LLPanelFace
2022-01-17 20:45:46 +02:00
1b929cb9a9
SL-16344 #2 Do not play media preview if not opened
2022-01-15 03:43:43 +02:00
488fb8bab6
SL-16344 #1 Sometimes editor's media title picks obsolete description
...
Wait for media_plugin to navigate to destination
2022-01-15 01:08:12 +02:00
722f7f32bc
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
2020-06-25 10:30:06 +02:00
a066c9a859
SL-13359 #10 Indicate face selection in tools floater
2020-06-22 19:48:00 +03:00
89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
583558dad8
SL-11378 Edit tool floater displays with issues if opened mid-drag
2019-06-06 20:05:51 +03:00
aa154f3c22
Merge viewer-neko
2019-04-03 00:18:43 +02:00
9ef117b1fd
SL-10815 FIXED The weight of an object is displayed in the 'Land tool' floater
2019-03-28 16:03:13 +02:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
f1d4e788e7
SL-967 simplify viewer log file field syntax
...
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
4652565392
Merge viewer-neko
2018-05-30 21:14:50 +02:00
177f24f56f
MAINT-8586 Eliminate obsolete xui elements
2018-05-29 17:26:10 +03:00
9fde690e7e
Merge Firestorm LGPL
2018-01-13 16:52:55 +01:00
e8c926b927
Backed out changeset 85f1bec4ee87 (FIRE-21263)
2018-01-08 17:23:58 +01:00
e41bdfc820
Merge viewer-neko
2017-12-20 23:07:38 +01:00
72b0ce5cb0
MAINT-8058 Simplification
2017-12-06 19:40:58 +02:00
6fe00fd9ad
MAINT-8058 Fixed background requests on every prim edit
2017-12-06 19:40:58 +02:00
bcfeda1fde
FIRE-21263: Remove the confusing temporary toggle of "Show Highlight" in build floater and make the change permanent
2017-11-24 18:57:04 +01:00
13cddfdfdd
Mac buildfix
2017-06-01 15:30:49 +03:00
8c393b4993
MAINT-321 If Spin option is turned on, user cannot lift an object using Ctrl button + Mouse
2017-05-31 19:55:38 +03:00
2347b25808
Merge viewer-neko
2017-06-09 11:49:10 +02:00
319a57ba1b
Merge Firestorm LGPL
2017-02-02 22:29:05 +01:00
74297fcee8
Fix a few UI warnings:
...
* Making dummy class LLView named "Buy Land..." in Menu Holder
* No callback found for: 'Media.ResetCurrentUrl' in control: current_url_reset_btn
* Making dummy class LLView named "media_tex" in toolbox floater
* Making dummy class LLView named "edit_media" in toolbox floater
2017-01-30 18:59:17 +01:00
31be233b66
Merge viewer-lynx
2016-12-15 09:46:35 +01:00
26511f5b87
MAINT-6994 Viewer still reports remaining capacity incorrectly during the presence of an region object bonus.
2016-12-13 11:59:53 +02:00
f56f77c1fd
Fix copy & paste error in permission check for editing media objects, found by Drake Arconis
2016-12-10 12:29:41 +01:00
8ef2d26d8f
Fix enabled state of select next/previous element button in tools floater
2016-11-29 16:06:08 +01:00
c331bcf184
FIRE-20387: Editing HUD attachment shows [CAPACITY_STRING] in tools floater
2016-11-20 12:35:13 +01:00
ad30fce29d
Fixed a bunch of XUI warnings
2016-11-16 14:55:15 +01:00
007cb590ba
Merge Firestorm LGPL
2016-03-31 18:55:05 +02:00
8eaa35a607
Fix FIRE-17951: Reworked build tools show highlight to be less hacks
2016-03-18 23:55:58 -07:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
66502df050
MAINT-8540 Eliminated a lot of xui related log warnings on startup and opening preferences
2018-04-20 20:21:20 +03:00
Ansariel