825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
730af5d488
Merged master (DRTVWR-503) into DRTVWR-482
2020-09-22 22:51:33 +03:00
34444a0873
SL-13697 Items I am wearing continue to go to lost and found
...
Contribution from Ansariel Hiller
2020-09-21 23:47:08 +03:00
c49565be6e
SL-13858 FIXED Group chat transcripts named with double (group) (group).txt after opening chat history.
2020-08-25 21:19:41 +03:00
9abbdb74f2
Merge branch 'master' into DRTVWR-483
2020-08-18 19:17:09 +03:00
b0274e1bdd
Merge branch 'master' into DRTVWR-482
2020-08-18 19:17:01 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
d240d381a2
SL-13583 Some behavior tweaks #1
2020-08-12 00:59:45 +03:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
b17e2aaff1
SL-13642 Updated contributions.txt
2020-07-22 06:48:15 +03:00
3c564f5afc
SL-11625 Fix for skewed baked texture offset values
2020-07-02 21:20:13 +03:00
9114d7a524
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
2020-06-03 15:37:08 +03:00
353afb48f2
SL-13239 Add 'Touch' to the various attachment context menus
2020-05-28 18:38:01 +03:00
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
6c79fdd695
Merge branch 'master' into DRTVWR-507-maint
2020-05-19 10:49:11 +03:00
63004f50e3
Merge branch 'master' into DRTVWR-482
2020-05-19 10:47:00 +03:00
05800a402b
Merge branch 'master' into DRTVWR-483
2020-05-19 10:42:26 +03:00
510574dc14
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-18 23:41:19 +03:00
e1504d8c56
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 21:09:42 +03:00
9c3368bbf6
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 19:08:55 +03:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
67d8dda08c
Merge branch 'master' into DRTVWR-483
2020-05-04 23:39:23 +03:00
89e17d1780
Merge branch 'master' into DRTVWR-482
2020-05-04 23:39:10 +03:00
6364e2fff6
Merge branch 'master' into DRTVWR-460
2020-05-04 23:35:54 +03:00
9c31597e5e
SL-13141 Crashfix contribution
2020-04-30 17:51:46 +03:00
a0d7d87355
Merge branch 'master' into DRTVWR-460
...
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
2020-04-26 21:57:40 +03:00
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21 15:37:25 +03:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
85fb2b81d8
SL-11360 Viewer floods the server with GroupProfileRequest
2020-02-14 18:37:25 +00:00
b9f0eb54ce
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-02-12 12:45:56 +02:00
d0c7b4fade
Merged in lindenlab/viewer-release
2019-11-27 08:19:22 +02:00
b371c5a35d
Merged in lindenlab/viewer-release
2019-10-31 21:13:12 +02:00
5082b42d0a
Merged in lindenlab/viewer-release
2019-10-23 18:30:09 +03:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
c7747d2a1b
merge
2019-10-16 22:24:03 +01:00
8e82f50a76
Merged in lindenlab/viewer-release
2019-09-10 23:31:38 +03:00
4921618390
Merged in lindenlab/viewer-release
2019-09-10 23:30:52 +03:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
a97f13e161
Merge viewer-release 6.3.2
2019-09-10 10:19:50 -07:00
8a3ae3a97d
SL-10675 Updated contributions.txt
2019-07-22 20:36:22 +03:00
f03b696c3d
Merge viewe-release 6.2
2019-07-12 08:34:25 -07:00
ff536ef9c2
Merged in lindenlab/viewer-release
2019-06-29 06:37:27 +03:00
139c66b684
Merged in lindenlab/viewer-release
2019-06-28 02:19:25 +03:00
ad64edd9c0
Merged in lindenlab/viewer-lynx
2019-06-22 03:17:43 +03:00
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
9313bc50c4
Merge the Rainbow
2019-06-20 13:42:00 -07:00
0574d03bfa
OPEN-345 Fixed enigmatic messages during build
2019-06-17 19:46:20 +03:00
b996c95f32
SL-11079 Updated contributions.txt
2019-05-28 23:52:23 +03:00
3175525950
Merged in lindenlab/viewer-release
2019-05-08 21:41:56 +03:00
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
65cb4b6d20
Merge 6.2.2
2019-05-08 10:37:34 -07:00
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
be0c609eaf
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
2019-05-02 13:11:18 +03:00
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
f14888b616
Merge 6.2.1
2019-04-17 08:43:14 -07:00
b5f8421839
Merged in lindenlab/viewer-release
2019-04-17 16:47:32 +03:00
922793e489
Merged in lindenlab/viewer-release
2019-04-17 16:47:13 +03:00
724e3cca96
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-11 00:19:58 +03:00
d7d8a15092
Fullbright + elimination of all references to calcFragAtmospherics.
...
--HG--
branch : OPEN-340
2019-04-10 02:49:25 -07:00
dcd8117b85
First stab at moving atmospheric var calcs to its own utility shader.
...
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good.
--HG--
branch : OPEN-340
2019-04-09 22:35:40 -07:00
457df9cd67
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-06 10:12:27 +03:00
2013578ca9
Update contributions.
...
--HG--
branch : BUG-226620
2019-04-03 16:07:39 -07:00
f89490c1de
Add attributions.
2019-04-02 17:03:35 -07:00
b8115d43c9
Merge 6.1.2
2019-04-02 14:32:59 -07:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
62bec6aa36
Merged in lindenlab/viewer-release
2019-04-02 22:21:35 +03:00
c6e310c7c2
Merged in lindenlab/viewer-release
2019-04-02 22:20:59 +03:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
47e3c3aa21
BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad
2019-03-29 15:57:22 -07:00
766ae4d122
SL-10675 Updated contributions.txt
2019-03-05 00:10:13 +02:00
599e081815
Backed out changeset: d5795c04fecc
2019-02-23 20:08:03 +02:00
f78ff79508
Update contributions list
2019-02-18 21:55:48 +02:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
da60cc476a
Merge viewer-release 6.0.2
2018-12-18 09:51:26 -08:00
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
3b932c27b7
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
baeca41027
SL-10089 Logs to see which gSavedSettings.get calls should be cached
2018-11-19 20:20:34 +02:00
d757234397
SL-9800 Changed llTextBox to have selectable "message" text
2018-10-10 00:04:13 +03:00
697d2cdff4
STORM-2116: Add to Cinder Biscuits contributions.
2018-09-12 20:21:13 -04:00
3961a9e80a
SL-11061 Viewer crashes on launch if serial is either unset or does not return a string
2019-04-30 15:24:49 +03:00
bd7ad9c157
Merge viewer-release
2018-08-02 23:02:42 +01:00
3983f5b1e2
Merged in lindenlab/viewer-release
2018-08-02 23:18:28 +03:00
21f19cb6f0
Merged in lindenlab/viewer-release
2018-06-22 11:08:36 +03:00
2db71067f2
Merge 5.1.7
2018-06-21 17:39:13 +01:00
253a767fa3
Backed out changeset: 4ce8c663a9a0
...
STORM-2122: UDP data bandwidth measuring is off by factor 8
2018-06-19 21:20:48 +03:00
b0e5bee0b4
MAINT-8723 - Selecting mesh objects make several HUD-related items invisible
...
FIXED (from FS Ansariel patches)
2018-06-07 18:46:03 +03:00
3ed3cfce56
Merge 5.1.6
2018-05-31 20:12:26 +01:00
eb8eaa58a4
Merge storm-2145 dev into lindenlab branch parented from viewer-release
2018-05-31 17:10:48 +01:00
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
bff875d25f
STORM-2145 Camera controls opacity is now working
2018-02-02 10:39:59 -05:00
a7911c4379
merge changes for 5.1.0-release
2018-01-19 11:18:29 -05:00
2269a9f074
MAINT-8085 done right
2018-01-17 13:31:26 +01:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
1e586749ef
STORM-2145 Merge up to viewer-release
2018-01-12 09:08:49 -05:00
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
f1c76a376c
STORM-2151: Respect "Hide cursor while typing" user setting on Windows
2017-10-16 10:41:45 +02:00
18fa2e6471
MAINT-7081 [FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
...
The trouble lines are:
U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
if (cur_size > 0)
{
memcpy(buffer, mFormattedImage->getData(), cur_size);
}
If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.
Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
788d745071
MAINT-7899 FIXED Apparent broken material texture selection
2017-10-13 12:23:08 +03:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
5d812b95e8
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
270cd8ff15
Merged in lindenlab/viewer-release
2017-06-20 23:16:03 +03:00
f7186ac260
Contributors list fix: NickyD and Nicky Dasmijn are the same person
2017-07-11 20:46:53 +03:00
530f69ff33
MAINT-7541 Not able to save login credentials on clean install
2017-07-10 17:22:12 +03:00
5478f2a223
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
5205be0c65
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
806fd24704
merge
2017-05-22 21:09:07 +01:00
ed9653f711
MAINT-7343 - contributions.txt update
2017-05-01 15:17:28 -04:00
d4d56f004a
MAINT-7074 Fixed ability to escape from skin directory with <icon>
2017-04-19 21:19:04 +03:00
b59ac959fc
MAINT-6519 Contribution, adds feature to replace inventory links
2017-04-27 19:19:11 +02:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
5d7c5ea4d2
MAINT-7059 [contribution] Import of custom spellcheck dictionary fails silently
2017-01-18 12:20:55 +02:00
6b59d55230
MAINT-7028 Fixes scrambling of Outfit Order in Appearance Panel
2017-01-06 01:25:15 +02:00
946b28ad76
Merged STORM-2142
2016-12-19 19:18:53 +02:00
a6cda1ee06
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
7dcea20c4d
Backed out changeset: b1a30962dd54
2016-12-15 02:41:39 +02:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
fb9cb88272
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
76b3efe01c
MAINT-6953 [Contribution] Error in DPI scaling calculation
2016-11-19 11:19:01 +00:00
fb0355fdba
Merged in Ansariel/storm-2141
2016-11-21 21:18:13 +02:00
ec5051699a
STORM-2142 Tweaks to some of the 4 combined issues
2016-11-16 11:21:54 -05:00
84222286cc
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2017-11-09 23:05:35 +02:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
3b1e19d23e
Backed out changeset: 5816c800a9c1
...
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-26 02:31:16 +03:00
3b328a3880
MAINT-6929 [Contribution] E-mail links are not parsed correctly when top level domain is over 6 characters.
2016-11-15 13:00:47 +02:00
b6e7708d60
MAINT-6912 Specifying physics mesh was resetting previous model name
2016-11-10 12:51:06 +02:00
5921cc9d8a
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2016-11-09 14:20:46 +02:00
a433c05bb0
MAINT-6911 Fixes viewer crash after using "Clear settings & reset form"
2016-11-07 21:03:05 +02:00
6083fd1cbe
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-07 12:33:14 +02:00
28c9002e98
MAINT-6906 Editing landmark name removes the land mark coordinates
2016-11-04 15:20:01 +02:00
97c372047c
Merged in lindenlab/viewer-bear
2016-10-27 21:10:46 +03:00
f5f4b771f1
Merged in lindenlab/viewer-bear
2016-09-30 17:44:38 +03:00
70a82ac3df
MAINT-6773 Add payment message
2016-09-28 12:35:34 +03:00
7a7dc795f6
MAINT-6744 'System UI size factor has changed... ' shouldn't appear after installation
2016-09-26 00:58:25 +03:00
741194085a
MAINT-6752 Updated contributions.txt
2016-09-23 00:50:16 +03:00
d6b0db5118
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
2016-08-26 17:02:32 +03:00
ca9d39c6c7
SL-3404 Don't send ParcelPropertiesRequest on every cursor position change
2016-08-25 13:42:37 -05:00
c4e9fe9fe5
MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name
2016-08-25 15:40:33 +03:00
d85bc7de7f
MAINT-6637 DebugAvatarAppearanceMessage incorrectly reports all avatars received COF version as -1
2016-08-16 17:48:52 +03:00
57da9bcd1b
merge from viewer-release
2016-08-15 09:52:06 -04:00
f4f30dae0f
MAINT-6612 Server release notes in Help -> About Second Life never fetch on any region.
2016-08-08 21:31:11 +03:00
974e5e5868
MAINT-6511 Replaced c-style casts with dynamic_cast in llfloater.cpp
2016-07-28 00:15:49 +03:00
138fd9d75d
Merged in lindenlab/viewer-lynx
2016-07-28 00:52:37 +03:00
936681cb82
MAINT-6568 Detached Object Ends up in Root of Inventory
2016-07-25 11:18:20 +03:00
0db98a6308
merge changes for STORM-2133
2016-07-14 11:35:14 -04:00
d2cf09e7d2
STORM-2133: VOICE-36 prevents proper shutdown of connector
2016-07-14 10:28:54 +02:00
efb49c8ccf
Merged in lindenlab/viewer-lynx
2016-07-18 13:08:04 +03:00
69de29d74e
MAINT-6552 Contribution: Viewer sometimes crashes when opening oversized textures
2016-07-06 10:22:50 +03:00
c2320fa0d0
MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky
2016-06-29 16:44:25 +03:00
ba36b366db
MAINT-6514 Appearance Mode Body Parts Select shows wrong type
2016-06-22 12:55:30 +03:00
84396f4e27
MAINT-6513 Math rounding errors
2016-06-21 16:25:18 +03:00
057c034cb4
Merged in lindenlab/viewer-lynx
2016-05-28 01:03:56 +03:00
7d54c62016
MAINT-6397 cut items should not go to trash
2016-05-25 20:37:52 +03:00
757414afb8
Updated contributions.txt
2016-05-25 17:20:13 +03:00
61a5c943ba
MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
...
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
2016-05-22 20:32:27 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
2d8b53854e
merge
2016-05-06 11:00:47 -04:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
393072b9d6
SL-344 - contributions.txt update
2016-05-04 08:43:26 -04:00
41dee0f748
MAINT-1211 - updated contributions.txt
2016-05-04 08:31:25 -04:00
a07897bf9c
contributions.txt edited online with Bitbucket
2016-04-21 01:27:52 +00:00
c3fd3b41e8
add contribution for MAINT-6218 (alpha-ed avatar showing)
2016-03-23 14:38:38 -04:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
f4e3306517
Updated contributors.txt
2016-02-29 18:09:25 +02:00
4fd57774dd
OPEN-297 simplify build number generation
2016-02-07 14:58:47 -08:00
867ef882fd
merge changes for OPEN-292
2016-02-07 13:41:41 -08:00
f5c133712b
Updated contributors.txt
2016-02-21 00:43:35 +02:00
d8f7a40dea
Added newly created tickets for Kitty's fixes to contributors.txt
2016-02-19 04:05:09 +02:00
3e56ba7d6c
Updated contributors.txt
2016-02-19 00:22:06 +02:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
77156c2b15
MAINT-1392 HUD objects Behave Badly in conjunction with the Mouse Scroll Wheel
2016-01-05 13:23:34 +02:00
cc235cdcc4
Merged lindenlab/viewer-tools-update into default
2015-11-29 20:14:22 -07:00
9848fc4253
merge changes for 4.0.1-release
2016-01-15 17:01:16 -05:00
4a187aec4e
MAINT-5756: Unicode characters in online notifications get stripped
2015-10-16 11:28:53 +02:00
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
d17614ca61
merge changes for 3.8.5-release
2015-10-12 15:24:56 -04:00
736549f03f
STORM-2122: UDP data bandwidth measuring is off by factor 8
2015-10-09 09:26:21 +02:00
67757ddd5b
MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
...
--HG--
branch : maint-5416
2015-09-04 21:06:22 +03:00
9c391b3dea
MAINT-5533 FIXED The fragment part of an URI is only shown if it contains a query part as well.
...
fix by Ansariel
2015-08-20 12:04:57 +03:00
71a468c6fb
merge changes for other open sourc contributions
2015-07-30 11:09:00 -04:00
57904b4def
MAINT-5416 Reverted changeset: 9bd24c17d908
2015-07-23 23:59:05 +03:00
269cc894a9
MAINT-5416 FIXED cannot right-click a rigged mesh that's worn
2015-07-17 07:31:36 +03:00
828f89f3a7
correct labels for rendering choices for STORM-2107
2015-06-30 16:46:49 -04:00
aa630cac08
merge buildcleanup
2015-06-25 12:13:10 -04:00
95fc2d48ec
merge changes for 3.7.30-release
2015-06-15 15:53:45 -04:00
5a282abe18
STORM-2113 - uri parsing cleanup and fixes
2015-04-11 15:23:06 -06:00
7a212eb7e5
merge changes for tools update tip
2015-03-26 10:53:53 -04:00
ab30a44d9d
Add Cinder Roxley as contributor for BUG-8835
2015-03-25 03:09:17 +00:00
d6f7a16a68
merge changes for 3.7.26-release
2015-03-23 22:39:18 -04:00
83851db09a
merge up to 3.7.25-release
2015-02-27 09:03:04 -05:00
d9673d6c1d
Merged lindenlab/viewer-tools-update into default
2015-02-26 14:55:50 -07:00
905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
c8a0aa99b4
STORM-2082 Fix issue with isDirty
2015-02-18 16:48:23 -05:00
8147f4c57a
add Sovereign Engineer to contribution credits
2015-02-18 09:54:06 -05:00
dce1339439
Add myself to contribution
2015-02-14 23:24:06 -08:00
bedbb65b33
STORM-2104 Statistics floaters adjustments
2015-02-12 14:10:20 -05:00
ca08bd5aba
OPEN-292 - Remove lscript from project,
...
Remove legacy udp script upload methods,
Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-02-08 12:53:39 -07:00
53fb7f9998
merge storm-2082 changes
2015-02-04 08:45:49 -08:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
0d6872e1f5
merge changes for STORM-2085
2015-01-06 11:36:10 -05:00
82a56fb9da
merge changes for STORM-2088
2015-01-06 11:35:32 -05:00
4d4ad1afaf
merge changes for STORM-2094
2015-01-06 11:18:45 -05:00
0e5dbc4ef8
merge changes for STORM-2099
2015-01-06 11:16:17 -05:00
7205dbdbe4
merge changes for MAINT-4677
2015-01-06 11:14:58 -05:00
29ccfc46b5
merge changes for STORM-2098
2015-01-06 11:05:55 -05:00
21c535635b
attribute STORM-2083
2015-01-06 11:04:36 -05:00
aeb64da07a
STORM-2100 Incorrect displays in Script Information window
2015-01-06 10:49:02 -05:00
4c96feb0e5
STORM-2099 Minor formatting issue with logged out message
2014-12-31 07:20:52 -05:00
a6dfe5a64e
STORM-2098 - Don't enable object edit for an invalid agent
2014-12-28 14:18:29 -07:00
2d7fb5c675
STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made
2014-12-28 09:34:28 -05:00
9c56eb9ead
merge changes for 3.7.23
2014-12-19 09:14:53 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
9f88029ca6
STORM-2092 Add "Copy outfit list to clipboard" for COF folder
2014-12-11 18:23:23 -05:00
0db6788347
STORM-2091 "Empty Trash"/"Empty Lost and Found" menu item is active even if empty
2014-12-10 11:09:28 -05:00
bf2e3fca73
merge changes for 3.7.22-release
2014-12-05 17:12:42 -05:00
cacaf21eb5
STORM-2088 Minimap no longer remembers zoom setting between sessions
2014-12-05 09:46:07 -05:00
4f076daeff
Merge downstream code and become 3.7.22
2014-12-02 10:41:20 -08:00
fe5ff3e74a
merge
2014-12-01 16:21:52 -05:00
41500add1e
STORM-2082 Pulled in Oz's render weight changes
2014-11-21 18:33:00 -05:00
44f5d73209
STORM-2086 Convert old style llinfos and llwarns to new format
2014-11-20 16:25:11 -05:00
38703d62e3
STORM-2085 Spelling error and duplicate entry in notifications.xml
2014-11-20 08:37:55 -05:00
5f608c0a23
OPEN-282 Use pthreads for TLS on mac
2014-11-19 08:01:28 -07:00
21a36e2c5b
MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view
2014-11-18 12:15:30 +01:00
7ffa456683
STORM-2080: correct fitted mesh rendering on some ATI cards
2014-10-14 11:22:39 -04:00
0311299be2
merge changes for STORM-2053
2014-10-13 17:16:57 -04:00
e7c33a5071
merge changes for STORM-2078
2014-10-13 17:16:22 -04:00
852426d71e
merge changes for 3.7.17-release
2014-10-13 17:13:15 -04:00
9c4a8951ff
MAINT-4455 FIXED stats - UDP Data should not show any comma
2014-09-22 13:30:11 +03:00
08a4d7a277
complete contributions for STORM-2069, STORM-2070, STORM-2071, STORM-2072
2014-09-02 16:25:49 -04:00
ae60558141
merge changes for STORM-2060/STORM-2076
2014-08-21 08:34:39 -04:00
fc0d618c2f
STORM-2078 Editing an objects rotation with the rotation rings often causes the object to jump to position <0,0,0> on the region and rotation changes to <0,0,0>
2014-08-20 23:41:33 +01:00
887510c335
Changed: Updated contributions file.
2014-08-20 16:07:01 +02:00
014a5fa513
merge changes for STORM-2040
2014-08-18 11:56:39 -04:00
b4704f5f8b
Merge viewer-bear and become version 3.7.16
2014-09-09 21:53:14 +03:00
7d9372b96d
MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only)
2014-09-04 14:13:47 +03:00
bca5c1ed79
Changed: Updated contributions file.
2014-08-15 22:41:10 +02:00
9d406f69cc
Changed: Updated contributions file.
2014-08-14 03:27:13 +02:00
210ff45bd6
corrected contributions.txt for OPEN-217
2014-08-06 17:42:29 -04:00
7ede86c97a
merge changes for STORM-2031
2014-08-06 16:18:45 -04:00
7062026da4
merge changes for STORM-2030
2014-08-06 16:17:55 -04:00
129c2db2d2
merge changes for STORM-2040
2014-08-06 15:34:08 -04:00
a45e727049
Add this to contributors.txt
2014-08-06 16:43:43 +00:00
b746d40678
Changed: Updated contributions file.
2014-08-01 20:17:05 +02:00
b5ac12d7b9
Changed: Updated contributions file with BUG-372 and BUG-1179.
2014-08-01 01:51:42 +02:00
0a120f75c3
Changed: Updated contributions file.
2014-08-01 00:37:58 +02:00
60c51f9bc4
Changed: Contribution file and updated it with all new STORM jira's that were fixed.
2014-07-31 07:27:52 +02:00
048be2eec3
Added: STORM-2040 tag to NiranV Dean's name.
2014-07-26 14:10:28 +02:00
009a3028ef
Added: NiranV Dean to contribution list.
2014-07-25 10:17:01 +02:00
8192a3c5b2
merge changes for STORM-2034
2014-07-21 10:00:09 -04:00
2b731d5f06
merge changes for STORM-2037
2014-07-16 13:46:47 -04:00
4cba2c4457
BUG-6659 On the Edit tab of the build menu, clicking the area in between the full bright checkbox and the materials drop down box opens the color picker.
2014-07-12 11:19:05 +01:00
e3a27586f1
STORM-2037 - Update fetchKeywordsFileresponder to use latest LLHTTPClient::responder changes
2014-07-09 09:10:10 -06:00
8d2e0fb3a0
STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting
2014-06-20 13:43:31 -06:00
984353d7ca
STORM-2036 - Fix trying to parse caps too early by adding a callback to check region caps when they haven't already been received
2014-06-20 11:02:50 -06:00
89837f3852
STOMR-2034 XML adjustments and a bit of code cleanup
2014-06-06 14:56:11 -04:00
4fffc8c8e4
STORM-2031 Display issues with Top colliders/Top scripts floater
...
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
2014-05-13 12:30:29 -04:00
3b95bffedd
STORM-2030 Forgot to add entry to contributions.txt
2014-05-12 16:55:17 -04:00
9353868d91
merge changes for STORM-1831
2014-04-23 11:53:05 -04:00
6c8bddca3d
merge changes for STORM-1915
2014-04-22 16:01:45 -04:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
cd382d08c8
add Cinder Roxley to contributors for STORM-1831
2014-04-22 13:04:36 -04:00
d60519d253
merge changes for STORM-2007
2014-03-18 10:46:52 -04:00
c617a2aa33
merge changes for STORM-1966
2014-03-18 09:10:19 -04:00
51e04f8866
merge changes for open-209
2014-03-14 14:54:45 -04:00
a64b1d0d30
merge changes for storm-2007
2014-03-14 14:34:06 -04:00
56d1db4875
merge changes for storm-1920
2014-03-14 14:19:36 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
54bc8b10ee
merge changes for storm-2018
2014-03-11 16:43:00 -04:00
529edff468
restore the relevant fixes for STORM-2011
2014-03-11 14:03:38 -04:00
2b4d3fff70
back out STORM-2011 due to conflict
2014-03-10 15:46:49 -04:00
2d6314f93f
STORM-2018 Group invite fails to let you join groups when groups maxed even when you leave group
2014-03-07 12:50:08 -05:00
208d9a2d21
merge changes for storm-2010
2014-03-06 14:55:11 -05:00
43eae43798
merge changes for storm-68
2014-03-06 13:01:12 -05:00
9185f1e256
merge changes for storm-2008
2014-03-06 08:30:47 -05:00
a373a7442c
merge changes for 3.7.2-release
2014-03-04 13:15:43 -05:00
ef794e7ffc
merge changes for storm-2015
2014-03-04 11:55:42 -05:00
413d29d3ee
merge changes for bug-1044
2014-03-04 11:22:19 -05:00
fe2801fc63
STORM-2017: Added translatable help text to rotation.
...
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.
While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate. I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
fbdbea1b18
merge changes for 3.7.2-release
2014-03-03 17:01:19 -05:00
ce284c28d8
merge changes for 3.7.2-release
2014-03-03 15:43:55 -05:00
a5e56067c2
merge changes for 3.7.2-release
2014-03-03 15:36:34 -05:00
55ceeae752
merge changes for storm-2008
2014-03-03 15:29:32 -05:00
dfbc6c65f6
merge changes for open-203
2014-03-03 15:08:20 -05:00
840e1da8aa
STORM-2017 Untranslatable text appears when scaling, or moving objects
2014-03-03 14:08:26 -05:00
1d30fe9554
merge changes for 3.7.2-release
2014-02-25 13:31:01 -05:00
199e65a6c5
STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only.
2014-02-24 10:57:53 -05:00
b0c255f4e6
merge up to 3.7.0-release and get unit test fixes
2014-02-11 09:20:58 -05:00
61dde95630
STORM-1915 Add name to contributors
2014-02-10 20:19:54 -05:00
8312517857
merge changes for storm-2011
2014-01-31 16:21:50 -05:00
Andrey Lihatskiy