af6e665d5c
MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS X
2012-09-07 11:22:45 -05:00
43d29ea03e
merge changes for DRTVWR-202
2012-08-22 17:11:10 -04:00
6e44b8342a
VWR-29543 In merchant outbox "create a Marketplace store" link opens wrong article in KB.
2012-08-21 12:30:00 +01:00
0c903609d4
merge changes for storm-1895
2012-08-16 10:55:31 -04:00
39d79080c0
merge changes for storm-1899
2012-08-16 10:33:42 -04:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
08f35b6a14
STORM-1899: Avatar hand poses randomly get stuck in spread position
2012-07-26 17:07:12 +02:00
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
5ed8ec6ca4
merge up to 3.3.3-release
2012-06-27 08:10:29 -04:00
b4e1d03584
STORM-1895 - Rename Delay Restart button to Cancel Restart
2012-06-26 15:37:31 +01:00
75a76491ed
STORM-1894 UIScaleFactor: raise limit from 1.4 to at least 1.5
2012-06-25 14:21:19 -04:00
ad8478c470
STORM-1892 Add Apply button to the edit content permission floater
2012-06-23 19:28:28 -04:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
e30fbb2837
merge changes for open-140
2012-06-19 12:36:47 -04:00
d1ac85a589
merge changes for open-142
2012-06-19 12:34:03 -04:00
dad85ce554
merge changes for storm-1868
2012-06-18 14:01:18 -04:00
bbf8137ce5
credit for STORM-1844
2012-06-18 13:59:22 -04:00
83ddded5ab
merge changes for storm-1877
2012-06-18 13:56:43 -04:00
d36f74ba33
merge changes for storm-1843
2012-06-18 12:50:15 -04:00
9b2daf4b19
add credit in contributions.txt
2012-06-18 12:48:57 -04:00
6c0922df91
add to contributions.txt
2012-06-15 08:39:11 -04:00
361a413d25
Add myself to contributions.txt
2012-06-12 09:06:12 -07:00
76abab0618
When using OS autobuild config switches, set build configuration in VS to specified type (release, relwithdebinfo, or debug)
...
Also, set startup project to SecondLife-bin
2012-06-11 13:19:15 -07:00
a64bb32b05
STORM-1877 Missing entries in strings.xml for some Inventory folder names
2012-06-08 18:05:31 -04:00
fbb4e5fb0f
STORM-68 As a Builder, I want that ability to set default permissions on creation of objects, clothing, scripts, notecards, etc.
...
First pass at implementation, debuggins lines still need to be removed and there is one known bug to be resolved.
2012-06-08 13:49:02 -04:00
3ebfcd7054
merge changes for DRTVWR-163
2012-06-08 09:00:05 -04:00
ada746bd2a
merge changes for DRTVWR-161
2012-06-06 16:44:55 -04:00
a4452eef27
merge changes for storm-1872
2012-06-05 10:44:02 -04:00
8276228600
merge changes for storm-1870
2012-06-05 10:43:35 -04:00
c432ee1581
merge changes for storm-1845
2012-06-05 10:43:14 -04:00
2ad0bc334d
storm-1703: update license statements
2012-06-05 10:02:48 -04:00
13ca132037
merge changes for DRTVWR-157
2012-06-04 17:07:27 -04:00
f9879b8ea9
STORM-1845: Move "Show HUD Attachments" to Me menu
2012-06-04 17:01:32 -04:00
c2f0a8ef02
STORM-1872 A line break is missing in ..\app_settings\settings.xml
2012-06-04 16:23:16 -04:00
47044de069
STORM-1838 Add "Request Teleport" option to the menu when right-clicking on avatars in the Nearby list
2012-06-04 11:23:38 -04:00
f58cfdac22
STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-01 16:01:40 -04:00
98457f8455
merge changes for storm-1852
2012-05-30 14:27:59 -04:00
6fa682bb77
merge changes for storm-1858
2012-05-30 14:27:35 -04:00
04d5a07949
merge changes for storm-1862
2012-05-30 14:26:20 -04:00
dd0c04b864
merge changes for storm-1860
2012-05-30 14:09:35 -04:00
c0a79227d7
Add individual volume controls to pannel_volume_pulldown
...
Also includes translations for some of the other languages
2012-05-29 16:52:57 -07:00
a491324677
merge up to latest viewer-release
2012-05-26 17:06:07 -04:00
dbac37dcb5
merge latest viewer-release
2012-05-26 16:12:33 -04:00
6525fc4a4f
merge changes for DRTVWR-147
2012-05-22 05:51:20 -04:00
6416ba767f
STORM-1862 The left-hand border of the input field for IMs is missing
...
With help from Jonathan Yap
2012-05-18 18:47:24 -04:00
dd5d7fadca
STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard
2012-05-18 12:12:42 -04:00
0af7f00174
STORM-1858 [TRUNCATED] FR - String truncation and floater not wide enough in the upload model window
2012-05-18 05:58:25 -04:00
8593020037
STORM-1852 Altitude display stutters or is clamped when flying higher than 4096m
2012-05-11 11:33:03 -04:00
790dfda434
merge changes for storm-1820
2012-05-01 13:27:34 -04:00
0248aa5ec2
merge changes for storm-1839
2012-05-01 13:27:02 -04:00
5d92c60a4a
merge changes for storm-1842
2012-05-01 13:26:20 -04:00
1b832eaa4b
OPEN-54: correct JsonCpp include path
2012-04-24 11:24:11 -04:00
03442801bd
contributors.txt update.
2012-04-21 18:17:37 +01:00
c7c7726c6f
merge changes for drtvwr-135
2012-04-13 17:11:19 -04:00
2b0318ffd0
STORM-1842 Don't save per-account settings if login not fully successful
...
Repo created from Firestorm patch by Jonathan Yap
2012-04-10 16:01:46 -04:00
9df3afc1ef
STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now that explicit ban height has been changed.
2012-04-06 09:48:54 -04:00
564121fca4
merge changes for storm-1823
2012-04-02 09:56:40 -04:00
e66817e6d7
merge changes for storm-1822
2012-04-02 09:56:11 -04:00
86863af947
merge changes for storm-637
2012-04-02 09:53:06 -04:00
98ce08c8fd
STORM-1820 Discoverability of the menu that opens the Block List is difficult
2012-03-30 18:06:21 -04:00
e741d17469
STORM-1828 Set to proper jira issue. Intermittent write to character/new archetype.xml from Develop->Avatar->
...
Character Tests->Apperance To XML. Add explicit outfile.close() method
before returning to caller. Add llinfos for file location as a troubleshooting
aid.
2012-03-27 13:46:22 -05:00
15d7da90c0
OPEN-138 Intermittent write to character/new archetype.xml from Develop->Avatar->
...
Character Tests->Apperance To XML. Add explicit outfile.close() method
before returning to caller. Add llinfos for file location as a troubleshooting
aid.
2012-03-26 21:29:01 -05:00
f71ca07998
storm-64: Local Textures
2012-04-02 09:34:14 -04:00
c7106a02b9
Merging latest changes for normalized blinn-phong.
2012-03-26 13:44:28 -04:00
129a522235
STORM-1822 Change size of Block button in dialog boxes to help prevent accidental clicks
2012-03-22 12:29:03 -04:00
8ce4be7688
merging up to latest viewer-development
2012-03-21 11:50:03 -04:00
0a87371567
merge changes for vmrg-230
2012-03-09 12:56:48 -05:00
eb7e48fc90
merge changes for storm-1808
2012-02-21 15:22:06 -05:00
3be60824c8
merge changes for storm-1807
2012-02-21 15:20:20 -05:00
f1c8674aa8
merge changes for storm-1809
2012-02-21 15:19:12 -05:00
57fe6f66f8
merge changes for storm-1810
2012-02-21 15:17:48 -05:00
1daac72722
STORM-1812 Music stream does not always restart after teleporting
2012-02-15 08:05:28 -05:00
381d5829db
merge changes for storm-1804
2012-02-09 11:54:31 -05:00
cb6fe4b4e9
merge changes for storm-1803
2012-02-09 11:54:02 -05:00
e836d90ebb
merge changes for storm-1795
2012-02-09 11:53:14 -05:00
c2e39e9230
merge changes for storm-1741
2012-02-09 11:52:39 -05:00
30fc66adf8
merge changes for storm-1718
2012-02-09 11:51:45 -05:00
1f5c2c056f
STORM-1808 Indicate ability to build
2012-02-08 18:25:35 -05:00
039c50f2b4
STORM-1807 Play animation floater 2nd play button active while animation is playing
2012-02-08 15:41:27 -05:00
93c570b38b
STORM-1809 The word "Multiple" does NOT show in the edit window when editing prims or linksets with mixed textures in LL V3
2012-02-08 14:27:55 -05:00
bd1ea1b764
STORM-1810 Display Z coordinate in Script Error window
2012-02-08 13:02:46 -05:00
d3cbcc58ef
merge changes for storm-1718
2012-02-06 15:52:58 -05:00
df5b1ed85b
merge changes for storm-1804
2012-02-06 15:51:54 -05:00
5b8bcee234
merge changes for storm-1793
2012-02-06 15:48:17 -05:00
234fe401ec
merge changes for storm-1795
2012-02-06 15:47:08 -05:00
8b29cd05a6
merge changes for storm-1803
2012-02-06 15:45:59 -05:00
c0ede2d2b3
merge changes for storm-1741
2012-02-06 15:43:57 -05:00
5b2dbbadf7
merge changes for latest viewer-development
2012-02-02 14:26:33 -05:00
4f58bd82a3
STORM-1741 Collection of color and skinning issues
...
With help from Jonathan Yap
2012-01-31 13:06:53 -05:00
439a7df6ba
STORM-637 Scripts Progress windows Missing
2012-01-30 16:12:40 -05:00
619f737abb
STORM-1803 Adding raw anim file upload support
2012-01-29 15:34:51 -05:00
3b2511661e
STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy
...
With help from Aleric Inglewood
2012-01-27 08:33:26 -05:00
d264b5b923
STORM-1804 Details... button on PERMISSION_DEBIT dialog triggers run_time_permissions() with a deny action
...
With help from Jonathan Yap
2012-01-25 07:41:08 -05:00
e377182c04
merge changes for storm-1799
2012-01-23 14:17:21 -05:00
f93126e1ea
merge changes for storm-1796
2012-01-23 14:15:55 -05:00
25610423cf
STORM-1718 For notifications.xml Mute and Ignore in ScriptDialog and ScriptDialogGroup can collide with user-supplied fields causing unexpected behavior
2012-01-19 15:33:48 -05:00
da40427a0b
STORM-1795 Ad-hoc messages are received even when "Only friends and groups can call or IM me"
2012-01-16 14:27:35 -05:00
1fc53d33bd
STORM-1799 Object doesn't appear in Block list if trying to block from Remote object inspector
2012-01-16 12:16:17 -05:00
c0d2d316be
STORM-1796 Preferences->Privacy->Only friends and groups can call or IM me cannot be changed unless Voice Chat is enabled
2012-01-15 10:04:41 -05:00
7bc4085eb2
STORM-1788 Clarify wording in About Land->Access and tooltips (and similar Estate panel)
2012-01-10 12:03:20 -05:00
0329025734
merge up to latest viewer-development
2012-01-09 09:05:14 -05:00
f92fd78e74
merge changes for storm-1790
2012-01-04 10:46:12 -05:00
988cb62d43
merge changes for storm-1727
2012-01-04 10:11:59 -05:00
d0c7eaa7cf
merge changes for storm-1725
2012-01-04 09:33:50 -05:00
97630acce0
merge changes for storm-1708
2012-01-04 09:32:38 -05:00
8a3aa3f6ca
STORM-1790 Provide a Develop sub-menu to change the default logging level
...
co-authored with Zi Ree
2011-12-23 12:06:36 -05:00
889d4d292b
merge up to latest viewer-development
2011-12-21 09:42:55 -05:00
b022ebf13c
merge changes for storm-1734
2011-12-20 10:39:06 -05:00
2667c6a80f
merge changes for storm-653 and storm-1737
2011-12-20 09:20:36 -05:00
a336f1ee39
merge changes for storm-1737
2011-12-19 13:16:01 -05:00
5226629883
STORM-1737 panel_edit_skin.xml uses confusing historical terminology
2011-12-18 10:29:05 -05:00
399bd5643c
STORM-653 As a user i would like to be able to see the available number of attachments and remaining free slots.
2011-12-17 13:27:20 -05:00
94673473ed
merge changes for storm-1653
2011-12-15 16:06:08 -05:00
916c4a79e5
merge changes for storm-1731
2011-12-15 16:05:26 -05:00
c0f5b24b54
merge changes for storm-1723
2011-12-15 16:04:40 -05:00
1b6ee87bc8
merge changes for storm-1733
2011-12-15 16:03:34 -05:00
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
821c964230
STORM-1736 Cropped buttons in the bottom of the Ad-hoc floater
2011-12-14 17:44:10 -05:00
fdc223287c
STORM-1734 Update contributions.txt with Storm jira number
2011-12-14 13:58:46 -05:00
eb7b43fb55
STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but has no shortcut
2011-12-14 13:21:48 -05:00
457f150734
add project information to doxygen output main page, update license URLs
2011-12-14 12:25:31 -05:00
7f85f6be6a
VWR-27832 L$ Transfer failures show alert as if successful
2011-12-12 20:07:34 -05:00
a03b3aaa60
STORM-1731 Ad-hoc confererence block failing. Residents using it to start massive multi-sim conferences, used as a griefing tool.
2011-12-12 08:51:16 -05:00
7457a3eb7a
merge changes for vmrg-199
2011-12-07 14:49:27 -05:00
cbfec00c6e
merge changes for storm-1713
2011-12-06 14:00:22 -05:00
4a0311f8c5
merge changes for storm-1712
2011-12-06 13:53:37 -05:00
f54caff1e4
merge changes for storm-591
2011-12-06 13:52:26 -05:00
fc671fa2b3
STORM-1728 Name truncation in the Region/Estate floater -> Covenant tab
2011-12-06 10:41:22 -05:00
a78894285a
STORM-1725 Truncation of UI element Preferences->General->Busy mode response
2011-12-06 10:03:26 -05:00
b89c1ac482
STORM-1727 Dates displayed incorrectly in group profile. year "2035"
2011-12-06 09:53:09 -05:00
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
6e2b3fd634
STORM-1712 Do not sort recent speakers list if mouse is hovered over it
2011-12-02 18:48:43 -05:00
9a79b6f330
storm-1717: fix avatar names in object details floater
2011-12-02 14:37:23 -05:00
34b44fe714
merge changes for storm-1719
2011-12-01 13:27:27 -05:00
47e493f5f8
STORM-1721 Set UI Size to Default Option Duplicated in Advanced Menu
2011-12-01 09:49:06 -05:00
93dbcb4dc8
STORM-1719 notifications.xml has two instances where a button shows as "Ok" and Not "OK"
2011-11-30 05:26:07 -05:00
d22584bfe5
merge changes for vmrg-193
2011-11-28 11:02:15 -05:00
5374e544ed
merge
2011-11-28 10:13:34 -05:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
e93b5b0d22
merge changes for storm-1684
2011-11-21 09:20:49 -05:00
b901998c6f
Add "Use Region Settings" to World->Sun menu
2011-11-21 09:20:09 -05:00
052d8a8f2e
merge changes for storm-1679
2011-11-21 09:11:01 -05:00
b28492fbff
STORM-1708 Adding ability to save/load scripts from file.
2011-11-17 23:17:26 +00:00
bdb27b7e81
STORM-1685 Wrong named control in floater_world_map.xml
...
Patch converted to hg format by Jonathan Yap.
2011-11-11 14:13:56 -05:00
281fde3c48
merge changes for storm-1105
2011-11-08 14:08:01 -05:00
d3eb5ac875
merge changes for storm-1222
2011-11-08 14:07:04 -05:00
49f2c4f78a
merge changes for storm-1674
2011-11-08 14:05:16 -05:00
450dc71396
merge changes for storm-1659
2011-11-08 14:04:17 -05:00
089a9ced0d
STORM-1679 Avatar Draw Weight number is always red
2011-11-03 08:25:34 -04:00
55f69de90c
merge
2011-11-02 11:46:18 -05:00
403cdb863d
STORM-1222 System message when trying to teleport back to Welcome Island isn´t localized
2011-10-28 22:04:20 -04:00
c8f88d1d59
STORM-1674 Set Help ID for new Translaton Settings floater
2011-10-28 19:04:20 -04:00
4cdf396125
STORM-591 As a music fan, I want audio to fade in gently so my immersion is increased
...
Co-written with Robin Cornelius
2011-10-28 17:48:24 -04:00
8b0d63f343
STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting for data)
2011-10-28 07:27:54 -04:00
252f851741
STORM-1659 dates reported as "2035" within groups
2011-10-27 13:36:32 -04:00
db643d1881
STORM-1653 Group notices sent by muted residents are still displayed
2011-10-26 11:21:01 -04:00
4fd9a53115
Merge STORM-959
2011-10-26 01:42:26 +01:00
42c166e451
STORM-959 Adding syntax highlighting for /* */ style comments
2011-10-26 01:38:29 +01:00
e2b52009ea
merge
2011-10-24 15:32:58 -05:00
255eebf116
merge changes for storm-1638
2011-10-21 06:48:24 -04:00
140ce422b8
merge changes for storm-976
2011-10-20 16:45:00 -04:00
a61401140e
merge changes for storm-1642
2011-10-20 15:04:30 -04:00
78900b4643
merge changes for storm-910
2011-10-20 15:03:42 -04:00
f19f43c746
merge
2011-10-19 16:21:18 -05:00
77dc594e79
merge back late changes and tags from release branch
2011-10-17 16:19:57 -04:00
9cb8e959af
STORM-1642 Typos in keywords.ini
...
With repo-making help from Jonathan Yap
2011-10-14 20:49:46 -04:00
984feefbec
merge
2011-10-14 17:56:55 -05:00
04eb6f0ef4
STORM-910 Text formatting issues in Land/Assets accordion
2011-10-14 17:55:04 -04:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
33dcb30166
merge changes for storm-1639
2011-10-13 08:01:28 -04:00
7a9fd689bd
merge changes for storm-1579
2011-10-13 07:57:24 -04:00
5cfd34df90
STORM-976 Object muted by name still displays notification message when clicked
2011-10-11 18:18:02 -04:00
be251b06eb
merge changes for open-38
2011-10-11 09:31:09 -04:00
0a3628b66d
STORM-1639 Duplicated XUI ID: floater_build_options.xml
2011-10-07 14:35:54 -04:00
aa341e918e
Duplicated XUI ID: floater_model_wizard.xml
2011-10-07 11:28:37 -04:00
df2e5fa37e
merge changes for vwr-27026
2011-10-06 20:19:36 -04:00
a41ca2c34d
merge fixes for storm-1602 up to latest viewer-development
2011-10-06 16:39:23 -04:00
fd91f09e19
STORM-1602 improvements from leliel Mirihi, and more optimizations
2011-10-06 16:37:11 -04:00
754ce2be40
SH-2477 Integrate Tofu's FXAA edge threshold tweaks
2011-09-29 20:20:56 -05:00
c0410361de
Statistic floater update to improve displayed info.
2011-09-26 13:16:17 -07:00
ddc74472e9
improve recognition of some more ATI Radeon cards, allow class zero use for Humper virtual machines
2011-09-23 13:03:11 -04:00
b2d20f5a98
merge changes for storm-1532
2011-09-14 08:33:25 -04:00
48e1a563ab
VWR-26622: correct recognition of Intel Mobile 4 Series GPUs
2011-09-13 12:40:37 -04:00
77f89dbaf2
STORM-1579 xml formatting issues in Region/Estate floater
...
Add entry to contributions.txt
2011-09-12 12:29:36 -04:00
84a53eb547
merge changes for storm-1297
2011-09-12 11:31:40 -04:00
0ab6eee099
merge changes for storm-1027
2011-09-02 13:48:29 -04:00
8efd992d50
correct DOS line endings
2011-09-02 13:48:01 -04:00
1379188c82
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-31 11:15:02 -06:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
ba6f7883ab
update list of translators
2011-08-31 10:35:49 -04:00
e62a4d4ec1
merge changes for storm-1567
2011-08-31 09:07:32 -04:00
ee4fc00a27
merge changes for storm-1572
2011-08-31 09:05:49 -04:00
3416cf0da8
merge changes for storm-1574
2011-08-31 09:05:06 -04:00
a2c5944666
merge changes for storm-1522
2011-08-31 09:03:13 -04:00
f6505dc261
add missing contribution record
2011-08-31 08:59:20 -04:00
4e220af01d
STORM-1297 WIP Block object inventory offer by the object's owner ID.
...
Submitting a fix by Jonathan Yap that I have cleaned up.
2011-08-30 20:09:39 +03:00
36f9b513b0
STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is truncated
2011-08-29 17:36:37 -04:00
b918ef5e6f
STORM-1574 Binary data in panel_login.xml -- filled up-pointing triangle.
2011-08-26 15:26:17 -04:00
f603d14339
merge changes for storm-1276
2011-08-25 13:24:48 -04:00
d254c7eb54
STORM-1572 XML issues for Basic/Advanced Mode button in menu bar
2011-08-24 18:13:38 -04:00
541e26d947
STORM-1567 Mute button for llDialog popup
...
Updating patch to current version of viewer-development
2011-08-23 07:55:34 -04:00
cc4e708848
merge
2011-08-18 14:16:06 -07:00
677135f3c7
STORM-1532: Don't re-request ParcelVoiceInfoRequest capability if the region definitely doesn't have it.
2011-08-18 14:33:24 +02:00
a666878a01
EXP-700 (VWR-24502) - added Satomi Ahn's name to list of contributors
2011-08-17 12:11:58 -07:00
91ac6b16f5
merge changes for VWR-25588
2011-08-15 09:43:38 -04:00
4c0565f381
merge changes for STORM-1534
2011-08-11 16:30:15 -04:00
608403a846
merge changes for vwr-26458
2011-08-09 10:22:04 -04:00
aeb1f944aa
storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used
2011-08-04 16:52:19 -04:00
732a6e3c81
STORM-1534: Derive Credits in About Second Life from doc/ sources
2011-08-02 13:42:41 -04:00
8cc315a199
VWR-26458: fixed typo in German translation: "Hilmmel" instead of "Himmel"
2011-07-22 00:14:03 +02:00
5774bac296
merged VWR-25588 fix (hovertext occlusion)
2011-07-21 11:02:30 +02:00
912e99906b
Credit Zi: FIRE-543 change fixes SH-489 and VWR-24017 and therefore also VWR-25588
...
It looks like the parent changeset (86eec7b46566; transplanted from
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/7af0278beaef )
fixes the following issues:
* SH-489 (object hover text not occluded)
* VWR-24017 (nametag / bubblechat not occluded)
* VWR-25588 (union of the above two symptopms)
Thus list them all under Zi's entry in doc/contributions.txt.
Also removed her name from the in-code comment, to adhere to our CS.
2011-07-21 10:49:19 +02:00
83e48f4a51
Merge
2011-07-19 23:48:11 -06:00
181c34c984
merge changes for vwr-26066
2011-07-19 15:43:38 -04:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
1f369cad59
merge changes for open-99
2011-07-13 17:43:45 -04:00
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
121d004b32
merge changes for storm-1459
2011-07-11 16:51:06 -04:00
7b9fc42941
merge changes for storm-1325
2011-07-11 16:49:29 -04:00
093fdcfcd3
merge changes for storm-1489
2011-07-08 20:16:35 -04:00
553e5001e9
merge changes for storm-1462
2011-07-08 12:56:00 -04:00
88a90aabcb
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-07 13:34:13 -07:00
f07173a968
merge changes for storm-1452
2011-06-30 06:40:46 -04:00
b278b61f4e
merge changes for storm-1406
2011-06-30 06:39:48 -04:00
c8c9384949
merge changes for storm-1327
2011-06-30 06:38:39 -04:00
ce93fc7fd5
merge changes for storm-1396
2011-06-30 06:37:25 -04:00
a80c79097d
merge changes for storm-457
2011-06-30 06:36:25 -04:00
c47d42d945
STORM-1315 Ability to do simple math in numeric edit fields
2011-06-29 23:40:20 -07:00
f6ddd71214
merge changes for storm-1392
2011-06-29 21:21:36 -04:00
d23e568c11
STORM-1462 [TRANSLATED BUT IN EN] ALL LANGS - Untranslated "Cancel" button on Edit Pick page
...
Forgot to add name to contributions.txt
2011-06-29 21:17:12 -04:00
8a4b3e33cd
EXP-961 FIX Keyboard definition file keys.xml contains invalid XML markup
2011-06-29 13:13:10 -07:00
a6475e379e
STORM-1459 "Wearing Tab" - Add ability to copy displayed inventory names to clipboard
...
Made changes with input from Oz & Vadim
2011-06-29 15:12:21 -04:00
68c8248fb9
STORM-1459 "Wearing Tab" - Add ability to copy displayed inventory names to clipboard
2011-06-29 10:28:06 -04:00
a300902494
merge changes for storm-1302
2011-06-29 09:54:27 -04:00
4425f9b821
merge changes for storm-1326
2011-06-29 09:53:34 -04:00
060d2f3c5e
merge changes for storm-1292
2011-06-29 09:52:43 -04:00
2ee2f1d6ff
merge changes for vwr-25480
2011-06-28 09:21:38 -04:00
b24f9295a2
merge changes for storm-1393
2011-06-28 09:20:53 -04:00
23d3b834bb
merge changes for storm-1334
2011-06-28 09:20:13 -04:00
77bffdcec7
STORM-1452 Debug settings -- TRUE/FALSE name (not label) translated in foreign languages
...
with help from Jonathan Yap
2011-06-28 06:39:52 -04:00
f23d6c22b4
STORM-457 There is no space char after [AGENT_NAME] in 'conference-title-incoming' for Japanese language
2011-06-27 08:41:11 -04:00
f70480e3b2
STORM-1406 [ENG LAYOUT] Viewer - Overlapping text in Input/Output devices preference
...
with help from Jonathan Yap
2011-06-26 19:03:32 -04:00
ec4a0a8cd8
STORM-1327 MULTIPLE LANGS (Spanish/German) [FORMATTING] Overlapped text in About Land Window when the land is for sell: "Los objetos se incluyen en la venta"
...
With help from Jonathan Yap
2011-06-26 09:08:44 -04:00
cce5dd64e0
STORM-1276 [MULTIPLE LANGS] Text truncation in Email Snapshot floater in Spanish localization
2011-06-26 04:59:02 -04:00
0ec675b7d1
STORM-1292 [UNTRANSLATABLE XUI ATTRIBUTE] "Mi apariencia" tab in side menu bar > "MIS VESTUARIOS". You don't have any outfits yet. Try Search. (ALL LANGS)
2011-06-25 18:39:12 -04:00
9a40b84bed
STORM-1302 (all langs) [TRANSLATED BUT IN ENG] (Spanish) Side Menu > Gente tab > MIS AMIGOS tab > buttons "Call", "Share" and "Teleport" and their tooltips
2011-06-25 16:37:10 -04:00
d66545d17f
STORM-1326 [ALL LANGS] (Spanish) [HARDCODED] Selling land, advice with "Anyone" in English.
2011-06-25 11:08:36 -04:00
0710fea048
merged OPEN-99: use -march=pentium* for 32-bit builds only
2011-06-21 00:20:03 +02:00
0488142b93
OPEN-99: use -march=pentium3 for 32-bit builds only
2011-06-21 00:09:17 +02:00
482a19c251
merged OPEN-38 (Aleric's standalone fixes for viewer-autobuild)
2011-06-20 18:14:06 +02:00
edc0e31bc2
STORM-1393 : Correction for loss of object/prim counts in the Build floater for
...
non-mesh objects.
2011-06-20 11:55:46 -04:00
1f15f91d18
contributions.txt for STORM-1325
2011-06-20 16:44:48 +03:00
90287404b2
merged VWR-26066: request LLFloaterWorldMap child "zoom slider" with correct type
...
LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter
2011-06-20 15:22:11 +02:00
c9eae38156
VWR-26066: FIXED request LLFloaterWorldMap child "zoom slider" with correct type
...
LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter
2011-06-20 15:16:27 +02:00
173ef3b2c0
STORM-1396 Storm-787 (mute gestures) also mutes sounds from objects
2011-06-19 07:07:31 -04:00
b91205ccf0
STORM-1392 Add Nearby Voice to the Communicate menu
2011-06-18 07:00:55 -04:00
624b050589
merge changes for storm-1103
2011-06-15 11:58:50 -04:00
26e1f92c83
merge changes for storm-1313
2011-06-15 11:58:01 -04:00
81afbd5b29
merge changes for storm-787
2011-06-15 11:57:13 -04:00
83cb59e45b
merge changes for storm-899
2011-06-15 11:56:18 -04:00
b6e69570dc
merge changes for storm-1273
2011-06-15 11:55:12 -04:00
e2a531791e
STORM-1334 Console debug data scrolls away too quickly and is hard to read
2011-06-15 07:02:28 -04:00
ac50481513
STORM-787 Mute Gestures Button
2011-06-12 16:00:33 -04:00
786da1eb38
VWR-25480 Worldmap: Partial region name search UI bug
...
Patch converted and tested by Jonathan Yap
2011-06-11 18:10:19 -04:00
68a7c4cb83
merge changes for vwr-25654
2011-06-07 18:58:28 -04:00
cc7a041bfe
Fix for Storm-956 crashes viewer when connected to non-LL grids
2011-06-03 14:41:08 -04:00
bf8b02b1f3
STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales
2011-05-26 09:17:14 -04:00
9ecc872b73
STORM-1273 Duplicate entries in settings.xml
2011-05-26 05:43:35 -04:00
fd427f0ab9
merge changes for storm-1100
2011-05-19 12:26:57 -04:00
78cad51818
merge changes for STORM-1259 and STORM-1175
2011-05-19 12:07:41 -04:00
35f394cd63
merge changes for storm-859
2011-05-18 18:24:13 -04:00
7713a84777
merge changes for storm-1175
2011-05-18 09:48:46 -04:00
2de13f8070
merge changes for storm-1259
2011-05-18 09:46:28 -04:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
4d2a64c4a4
STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to see in 1.23
2011-05-16 16:34:26 -04:00
d7d94460d0
STORM-859 : Replacing winres.h with windows.h so that the viewer will build with-out
...
having to copy any files to the source tree when useing express versions of
Visual Studio.
2011-05-15 21:57:27 -04:00
66c078de5e
merge up to latest viewer-development
2011-05-13 13:28:51 -04:00
27fd0d1a93
storm-1100: merged many more updates and refinements to table, added tester and files to test with
2011-05-13 13:27:56 -04:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
ad0cb157fe
STORM-1175 Fixing close button, for Custom Port warning, in Preferences => Setup => Network.
2011-05-12 11:42:46 +01:00
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
86180db1f1
STORM-1236 snapshot: Please resize the text box or modify the text so that it fits.
2011-05-06 20:58:48 -04:00
0ca94ddec2
merge changes for open-61
2011-05-04 19:02:06 -04:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
8fae347ba9
VWR-25654 FIXED memory leak in LLTranslate::getTranslateUrl
2011-05-01 22:04:06 +02:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
95f41fbd9b
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Mac.
...
Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the
corresponding Mac file.
2011-04-25 13:46:31 +02:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
4906f4644f
OPEN-61 Adding locations that redistributable package installs msvc* files.
2011-04-21 22:11:48 +01:00
252cb50c38
merge changes for storm-1088
2011-04-20 20:21:55 -04:00
47b8d252ff
corrected issue in doc/contributions.txt
2011-04-20 07:13:53 -04:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
26b15973af
STORM-1088: fix loading of winmm.dll
2011-04-17 08:04:02 -04:00
af6133dfa5
merge
2011-04-15 14:13:57 -05:00
04f79f6358
STORM-956 Ability to mute dialogs by muting object (or object owner)
2011-04-15 13:13:15 -04:00
5e2b781e78
STORM-1103 Nearby sidebar minimap should be optional
2011-04-14 08:11:06 -04:00
7577ec25a0
STORM-1095 FIX Chat preferences > font size should increase size of input text in the chat box.
...
Submitting on behalf of Jonathan Yap.
2011-04-14 00:52:40 +03:00
efa26485df
STORM-1128 Sort the results of using search in the World Map
2011-04-13 15:09:44 -04:00
88a7262340
merge changes for storm-1098
2011-04-12 20:38:04 -04:00
c857064af2
merge changes for storm-1101
2011-04-12 20:35:33 -04:00
3e7481064f
fix contributions.txt whitespace
2011-04-09 18:40:35 -04:00
ab483c6e7c
STORM-1147: fix skin-tight clothing
2011-04-09 17:10:09 -04:00
51b75b8832
merge changes for storm-1108
2011-04-08 17:34:49 -04:00
34afe36c35
merged OPEN-38 (Aleric's standalone fixes for viewer-autobuild)
2011-04-07 16:46:57 +02:00
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
f41cbc0ac8
merge changes for storm-1094
2011-04-06 07:32:56 -04:00
13458a96c7
contributions.txt entry for OPEN-38
2011-04-06 03:33:53 +02:00
3c5dc8b9d3
STORM-1098 : Made change to debug setting description for ShowNetStatus
2011-04-05 12:37:03 -04:00
ca186a6401
Parenthisized a #define to make it safer, adjusted some notes (and added a TODO) around some extremely obscure code that needs further attention but which is outside this scope.
2011-04-04 10:24:43 -07:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
8ccf3fbe3b
Automated merge up from viewer-development into mesh-development
2011-03-31 16:40:57 -04:00
a71e0b1862
pull latest changes from viewer-development
2011-03-30 17:37:19 -04:00
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
9c0757511e
merge changes for storm-1077
2011-03-29 19:19:24 -04:00
567035a2f7
STORM-1094 Chat preferences > font size should increase size of input text in IM window
2011-03-25 17:58:20 -04:00
c7cacf7d67
STORM-1108 Enable Hints menu entry/preference is confusing
2011-03-25 17:17:05 -04:00
40e14802e3
forgot to update contributions.txt
2011-03-24 12:56:15 +01:00
be545aa51b
STORM-1090 : add attribution for the fix to Nicky
2011-03-23 20:40:35 -07:00
67561663da
STORM-1101 Using the -login parameter makes some keys and right click menus not work
2011-03-23 14:55:28 -04:00
be553242ef
Automated merge up from viewer-development into mesh-development
2011-03-21 10:38:39 -04:00
819c7f0dd2
document contributions from Nicky Perian
2011-03-20 07:48:29 -04:00
abc259618f
merged OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 22:43:33 +01:00
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
6ec5177667
OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 21:07:09 +01:00
fef21534e9
OPEN-37 : pull into viewer-autobuild2010
2011-03-18 15:35:20 -07:00
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
3b1dee9abf
OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to
...
use VS2010 Autobuild
2011-03-18 08:05:36 -04:00
25b69823e6
merge changes for storm-1064
2011-03-16 21:24:21 -04:00
d9015a836f
STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button"
2011-03-16 18:32:28 -04:00
2d29b51f64
merge
2011-03-14 18:18:33 -07:00
13705596af
Automated merge up from viewer-development into mesh-development
2011-03-14 12:03:14 -04:00
522af96aca
STORM-1001 : pull into viewer-development
2011-03-11 16:05:27 -08:00
4790944923
STORM-1067 : pull into viewer-development
2011-03-11 16:04:17 -08:00
8c20875323
STORM-1059 : pull into viewer-development
2011-03-11 16:02:40 -08:00
22946d446e
STORM-1073 : pull into viewer-development
2011-03-11 16:01:21 -08:00
d550a7e8bc
STORM-1020 : pull into viewer-development
2011-03-11 15:57:57 -08:00
16443c4df3
STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett)
2011-03-11 15:09:44 -08:00
4223ab9acf
sync up to latest viewer-development
2011-03-11 17:40:31 -05:00
005da00fff
STORM-1059 : Fix for cache purging (fix by Aleric)
2011-03-11 14:38:09 -08:00
d4d292258e
Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
...
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
c790866e46
Corrected a call to the mac-specific command "Rez" that had the wrong case. This is only an issue on Macs that have a case-sensitive root filesystem.
2011-03-10 12:06:59 -08:00
65bdb53753
STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall
2011-03-10 06:44:03 -05:00
63636e8cea
merge
2011-03-09 10:56:03 -08:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
cd3b76cb52
STORM-10140 : pull into viewer-development
2011-03-08 16:12:05 -08:00
0bc84cea2e
STORM-990 : pull into viewer-development
2011-03-08 16:07:52 -08:00
be9bae601c
STORM-1045 : pull into viewer-development
2011-03-07 14:31:09 -08:00
4d8244573c
STORM-1040 Text that shows what Beacons you are viewing is always in English
2011-03-04 08:46:45 -05:00
0247cd6aeb
STORM-236 FIXED Allow the "Speak" button to be removed, like other buttons.
...
Cumulative diff of changes made by Wolfpup, Richard and me.
Description:
* Ability to hide the Speak button with the bottom tray context menu.
* Made the chat input resize handle visible, so that the feature is easily discoverable.
* Applied Richard's fix to layout panel resizing logic.
2011-03-03 20:49:42 +02:00
64c07135ba
merge up from viewer-development
2011-03-03 07:20:04 -05:00
2ef66a7cfa
STORM-954 : pull into viewer-development
2011-03-01 12:02:14 -08:00
4e3068fcd4
STORM-1024 : pull into viewer-development
2011-03-01 11:53:47 -08:00
f86e112556
STORM-977 : pull into viewer-development
2011-03-01 11:50:12 -08:00
6fa702719c
merge
2011-02-28 13:02:15 -08:00
dc3823b629
Automated merge up from viewer-development into mesh-development
2011-02-28 11:05:33 -05:00
513fdff9cd
STORM-990 merge with current v-d & fixed merge conflict
2011-02-25 20:21:54 -05:00
9962560f57
STORM-980 : pull into viewer-development
2011-02-25 15:44:38 -08:00
8976c93b5c
STORM-974 : pull into viewer-development
2011-02-25 15:42:07 -08:00
b9c6c9d273
STORM-979 : pull into viewer-development
2011-02-25 15:39:01 -08:00
5b90db03d7
STORM-1020 It is sometimes necessary to press ALT+CTRL+D twice to get the Debug menu on the login screen
2011-02-23 18:51:29 -05:00
95838efeaa
Merge
2011-02-23 14:39:42 -07:00
668307e4e3
STORM-1019 Add ability to display beacons for Media on a Prim objects
...
Changes merged into viewer 2 by Jonathan Yap
2011-02-23 15:50:55 -05:00
29415d1407
Merge
2011-02-23 13:48:35 -07:00
561e050474
VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat history
...
* Clean up changes based upon feedback from reviewers.
* Improve comment based upon feedback from reviewers.
2011-02-17 20:59:33 -06:00
03c738d0c9
merge
2011-02-17 12:14:46 -08:00
b1e39f8544
Mesh-development work in progress
2011-02-17 10:26:28 -05:00
bf7801aeec
merging in latest viewer-development
2011-02-16 18:18:34 -05:00
eacd9d5d59
merge changes for storm-981
2011-02-16 15:52:05 -05:00
eff712570d
STORM-990 Merged from current v-d trying to resolve merge issue Oz was having
2011-02-15 16:10:21 -05:00
e3f075f775
STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 meters
2011-02-15 14:13:43 -05:00
ef49d3f30b
merge
2011-02-14 11:31:24 -08:00
547293305b
Automated merge up from viewer-development into mesh-development
2011-02-14 09:57:32 -05:00
2bd790daaa
STORM-990 The arrow in the bottom right of the Landmark panel points down
2011-02-12 06:30:19 -05:00
e15b543dd6
STORM-975 : pull into viewer-development
2011-02-11 17:42:37 -08:00
4d040e3c5d
merge local changes
2011-02-11 14:06:27 -05:00
355d6d1f79
STORM-980 Appearance panel / Wear button is too wide
2011-02-11 05:17:05 -05:00
29b3207fe4
OPEN-29 Error out if lldir_<platform>.h is included when building for a different platform
...
As far as I know, there is no good reason to include e.g.
indra/llvfs/lldir_win32.h while not building for a windows target, so be
better prevent this to avoid hard to find errors.
2011-02-11 01:27:01 +01:00
06c1fede78
STORM-979 selection outline from inventory bottom panel buttons is cut at the left side when clicked.
2011-02-10 15:22:36 -05:00
c3d46cf609
merge
2011-02-10 09:54:55 -08:00
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
9aaf4b3ba7
STORM-981 : Fix Linux link issues when LL_TESTS is ON
2011-02-09 22:08:43 -08:00
333a9b3f97
STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used
2011-02-09 10:52:12 -05:00
47642e96f9
STORM-953 : pull into viewer-development
2011-02-08 22:23:32 -08:00
6ba900073f
STORM-955 : pull into viewer-development
2011-02-08 22:22:25 -08:00
2a13dc7930
STORM-960 : pull into viewer-development
2011-02-08 22:21:15 -08:00
979cd0300f
STORM-975 forgot to update contributions.txt
2011-02-07 11:55:17 -05:00
759eed5ef6
STORM-974 forgot to edit contributions.txt
2011-02-07 11:53:08 -05:00
ef490e308c
Introduces a LLThreadLocalData class that can be
...
accessed through the static LLThread::tldata().
Currently this object contains two (public) thread-local
objects: a LLAPRRootPool and a LLVolatileAPRPool.
The first is the general memory pool used by this thread
(and this thread alone), while the second is intended
for short lived memory allocations (needed for APR).
The advantages of not mixing those two is that the latter
is used most frequently, and as a result of it's nature
can be destroyed and reconstructed on a "regular" basis.
This patch adds LLAPRPool (completely replacing the old one),
which is a wrapper around apr_pool_t* and has complete
thread-safity checking.
Whenever an apr call requires memory for some resource,
a memory pool in the form of an LLAPRPool object can
be created with the same life-time as this resource;
assuring clean up of the memory no sooner, but also
not much later than the life-time of the resource
that needs the memory.
Many, many function calls and constructors had the
pool parameter simply removed (it is no longer the
concern of the developer, if you don't write code
that actually does an libapr call then you are no
longer bothered with memory pools at all).
However, I kept the notion of short-lived and
long-lived allocations alive (see my remark in
the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356
which requires that the LLAPRFile API needs
to allow the user to specify how long they
think a file will stay open. By choosing
'short_lived' as default for the constructor
that immediately opens a file, the number of
instances where this needs to be specified is
drastically reduced however (obviously, any
automatic LLAPRFile is short lived).
***
Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/
regarding (doxygen) comments. This patch effectively only changes comments.
Includes some 'merge' stuff that ended up in llvocache.cpp
(while starting as a bug fix, now only resulting in a cleanup).
***
Added comment 'The use of apr_pool_t is OK here'.
Added this comment on every line where apr_pool_t
is correctly being used.
This should make it easier to spot (future) errors
where someone started to use apr_pool_t; you can
just grep all sources for 'apr_pool_t' and immediately
see where it's being used while LLAPRPool should
have been used.
Note that merging this patch is very easy:
If there are no other uses of apr_pool_t in the code
(one grep) and it compiles, then it will work.
***
Second Merge (needed to remove 'delete mCreationMutex'
from LLImageDecodeThread::~LLImageDecodeThread).
***
Added back #include <apr_pools.h>.
Apparently that is needed on libapr version 1.2.8.,
the version used by Linden Lab, for calls to
apr_queue_*. This is a bug in libapr (we also
include <apr_queue.h>, that is fixed in (at least) 1.3.7.
Note that 1.2.8 is VERY old. Even 1.3.x is old.
***
License fixes (GPL -> LGPL). And typo in comments.
Addresses merov's comments on the review board.
***
Added Merov's compile fixes for windows.
2011-02-05 15:58:07 +01:00
84645f5b59
merge
2011-02-03 09:49:14 -08:00
957b8b15e1
Automated merge up from viewer-development into mesh-development
2011-02-03 10:32:05 -05:00
38b228ad18
STORM-953 Clarify what happens when you uncheck Allow Public Access
...
Note: This change also incorporates STORM-960
2011-02-02 18:41:11 -05:00
df05f01fcd
STORM-960 Descriptive text missing next to first checkbox in About Land/Access
...
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02 18:36:42 -05:00
dca34a56d2
STORM-435 : pull into viewer-development
2011-02-02 15:04:27 -08:00
ce90d8f8da
merge
2011-02-01 09:45:28 -08:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
cb6d59513e
merge changes for storm-829
2011-01-31 12:32:57 -05:00
0d5b0cad14
Embed Minimap into the Nearby list of the People Sidebar
2011-01-26 19:22:42 -05:00
d0cba9e919
Automated merge up from viewer-development into mesh-development
2011-01-24 10:56:40 -05:00
295536ae98
VWR-24321: fix validation of textures that start with 00
2011-01-24 09:35:41 -05:00
7a453b7c93
add missing entry in contributions.txt for VWR-24347
2011-01-21 16:20:29 -05:00
ee6a40beb1
VWR-24519: make debugging easier by not spawning spare process
2011-01-21 16:02:38 -05:00
97a9211d87
VWR-24354: correct manifest dependencies to prevent parallel install problem
2011-01-21 15:48:12 -05:00
790dfe7556
merge changes for storm-844
2011-01-21 15:29:40 -05:00
4652e26196
merge changes for storm-869
2011-01-21 15:14:39 -05:00
38f4bad925
Automated merge up from viewer-development
2011-01-21 10:36:29 -05:00
c47ab36b20
VWR-24320: remove dump of call stack on clean exit
2011-01-20 16:01:27 -05:00
a873ae55a3
VWR-24317: remove warning due to unassigned variable
2011-01-20 15:57:07 -05:00
42604a1080
VWR-24315: update cached control values when resetting debug setting to default
2011-01-20 14:35:04 -05:00
80d7432ce6
VWR-13040 - clean up LLObjectSelection iterator
2011-01-20 14:26:57 -05:00
3571e83b64
STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup
2011-01-19 06:02:08 -05:00
8a22154e5d
merged VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
2011-01-18 00:34:09 +01:00
eb9f19dabd
VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
...
CMake before 2.8.2 doesn't support QUIET for pkg_check_modules(), yet.
Credit goes to Aleric, 'cause he told me what to change.
2011-01-17 18:52:24 +01:00
74fdba8295
merge changes for vwr-24420
2011-01-17 10:30:36 -05:00
1d7b46e2c3
VWR-24217: allow Contents folder from object to be dragged to inventory
2011-01-17 10:09:52 -05:00
6a3d06deca
STORM-844 Better way of doing "More" should be "Less" when Media Control is open
...
thanks to Twisted Laws
2011-01-16 12:10:44 -05:00
4f06f3dae6
FIX VWR-24509 Fix SSAO speckling artifacts at distance, re-enable distant SSAO
...
(transplanted from ef938dea0504b12fcf802f38fcf5457ba566c468)
2011-01-16 13:36:44 +00:00
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
c020c5c0f3
STORM-723 : pull in viewer-development
2011-01-12 12:01:44 -08:00
40cd81f423
STORM-615 : pull in viewer-development
2011-01-12 11:18:19 -08:00
e27ae655c6
STORM-844 Minor adjustment to contributions.txt
2011-01-12 10:37:15 -05:00
3703f0bb0d
STORM-844 "More" should be "Less" when Media Control is open
2011-01-12 08:24:38 -05:00
fdf19a5268
Automated merge up from viewer-development
2011-01-10 11:20:39 -05:00
fe28f89e7e
merge VWR-24420 into v-d
2011-01-09 18:29:56 +02:00
db1a63e99e
FIX VWR-24420 Keep alpha channel in PNG images with background color.
...
Remove code that composites RGBA PNG images that specify a background
color down to RGB.
2011-01-09 01:13:38 +02:00
8cfea0bab1
VWR-1095 fix for problems with uploads following bulk upload failure
...
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
c692b2bdb2
STORM-435 There is no space between name of object and value of object in Chat step while creating new gesture
2011-01-07 13:12:39 -05:00
61e3c95dbf
Automated merge up from viewer-development
2011-01-07 10:14:33 -05:00
894e98a708
merge changes for storm-812
2011-01-06 14:33:35 -05:00
b30ff3fb9a
Automated merge up from viewer-development
2011-01-06 11:06:09 -05:00
d0b5e6b0b4
STORM-829 Viewer 2 does not parse /me in object Instant Messages
2011-01-06 06:07:11 -05:00
eb0b8ab3ea
merge changes for storm-825
2011-01-05 17:53:37 -05:00
7c7527b672
Automated merge up from viewer-development
2011-01-05 15:10:39 -05:00
78895f9e0c
merge changes for storm-467
2011-01-04 16:45:08 -05:00
05810f063d
merge changes for storm-737
2011-01-04 16:43:26 -05:00
e4591a8518
merge changes for storm-466
2011-01-04 16:41:05 -05:00
9531046609
STORM-955: VWR-24312: Massively duplicated objects
...
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.
After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
44e6327674
STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp
...
Removed the skipping of a working test as this was causeing a the test to fail
building and thus not actualy running all the tests.
2010-12-28 19:14:33 -05:00
Dave Parks