7e0bc07e5c
Merged lindenlab/viewer-release into default
2013-06-27 21:22:44 -06:00
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
1108cd0e5c
merge changes for 3.6.0-release
2013-06-19 17:56:43 -04:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
e23228fef2
merge 3.5.0-release
2013-06-19 13:59:52 -04:00
761bf254a4
merge changes for 3.6.0-release
2013-06-17 16:50:35 -04:00
0af636e632
Merged with viewer-release
2013-06-17 04:39:47 -04:00
9b23298970
STORM-1953 Notifications that involve deleting something -- errors in text
2013-06-13 15:40:12 -04:00
2268bf3833
merge changes for 3.5.3-release
2013-06-13 15:28:13 -04:00
4f7b8a7e86
STORM-1952: Add a confirmation modal when ejecting a member from a group
2013-06-11 18:54:54 -06:00
a2fa9a2bc2
merge changes for 3.5.3-release
2013-06-06 16:46:31 -04:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
90a3285e26
CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
2013-05-31 20:05:12 +03:00
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
3698aece0d
Merge latest viewer-release
2013-05-29 14:37:22 -07:00
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
4cf16ffdfb
STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed
...
Bonus: Correct the immediately preceding auto replace comment
2013-05-22 21:43:32 -06:00
5758b9e304
merge changes for 3.5.3-release
2013-05-22 11:09:43 -04:00
2df5b9caa6
BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.
2013-05-21 17:25:51 -04:00
72e7269da3
merge changes for 3.5.2-release
2013-05-20 09:08:20 -04:00
46eface63c
NORSPEC-181 Fix for performance regression.
2013-05-14 16:20:54 -05:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
38c1cd2d29
STORM-1948 - Fix for Set home to here - screen_home.bmp not saved
2013-05-13 17:18:38 -06:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
cf37c67764
Merge downstream code from viewer-bear
2013-04-30 10:02:05 -07:00
35f7a75083
Merge in downstream code from viewer-beta
2013-04-29 15:12:54 -07:00
5af5b49a62
Merge in downstream viewer-beta
2013-04-29 12:05:44 -07:00
bfb1ab134f
merge changes for 3.5.1-beta3
2013-04-23 14:29:24 -04:00
06d7845a5a
SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters.
...
Integrated Nicky Dasmijn's patch to handle the unicode file paths properly.
Code reviewed, patch was clean.
Tested locally, correctly allows wearables to load where they would fail before.
Should be ready for automated build & QA.
2013-04-22 19:14:24 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
ed2b5da8f1
merge changes for DRTVWR-298
2013-04-18 14:55:28 -04:00
490edf41eb
BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
...
Added checks to validate that the selection list is non-empty
2013-04-17 19:20:42 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
2fde4a9ae5
merge changes for 3.5.0-beta7
2013-04-01 14:24:01 -04:00
5098d43a9b
STORM-1941: Cocoa project viewer: some coordinate conversions are off (Katharine Berry)
2013-04-01 08:25:11 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
76f8d755b0
merge changes for storm-1931
2013-03-25 15:37:45 -04:00
a976f5c217
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
2013-03-25 12:19:02 -07:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
6f2fef886e
merge changes for storm-1911
2013-03-25 10:53:37 -04:00
bd57150f13
merge changes for storm-1910
2013-03-20 16:37:00 -04:00
4b1c1e4e02
merge changes for storm-1931
2013-03-20 15:33:09 -04:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
6807214bb9
merge changes for 3.5.0-beta3 (chui)
2013-03-19 15:25:22 -04:00
ca17a74f18
merge changes for storm-1910
2013-03-19 15:21:16 -04:00
ed7785bf97
merge up to 3.5.0-beta3 (chui)
2013-03-18 14:30:57 -04:00
a625dbe35e
merge changes for 3.5.0-beta3
2013-03-15 15:42:21 -04:00
75722baf29
merge changes for latest viewer-development
2013-03-13 15:15:15 -04:00
e5aa9088f0
CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat
2013-03-11 14:59:53 -07:00
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
2e8b2558b4
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
2013-03-07 14:13:14 -08:00
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
93eaccae6f
Modify LLInstanceTracker to avoid using a map of strings to find a map of foo to find some pointers
2013-02-28 15:35:14 -08:00
f3025b0ae4
STORM-1933: Certain show in search categories for parcels will not stay selected
2013-02-23 02:01:07 +01:00
bf981db8b9
STORM-1932: Region/Estate floater contains unlocalizable strings
2013-02-23 00:12:08 +01:00
2474385a2a
STORM-1931: Added option to disable chat animations (say/whisper/shout)
2013-02-22 11:19:51 +01:00
010c87788d
Merge with HEAD
2013-02-15 10:15:58 -08:00
cc260a6356
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-02-14 12:16:37 -06:00
bc60d34f68
MAINT-2368 Pull in Firestorm fix for textures unloading behind you.
2013-02-14 12:15:59 -06:00
c880c961bb
merge changes for 3.4.5
2013-02-14 09:05:55 -05:00
94ae64d6fd
Pull and merge viewer-release
2013-02-12 14:59:59 -08:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
bfffedaec9
Trivial whitespace change to ignite new Team City build after some admin work
2013-02-06 15:09:44 -08:00
5766592712
Updated contributions text file with people who worked on the FMOD upgrade patch
2013-02-06 13:57:51 -08:00
1407f4f11a
STORM-1831 Start updating work from 2012-03/04 to be in line with current viewer-release.
2013-02-05 07:18:44 +00:00
0908b60c1c
STORM-1930 Quality & Speed slider has Ultra label where High should be.
2013-02-01 08:10:16 +00:00
0092ec9bd9
STORM-1929 Top bar: speaker icon clipped, overlapping UI elements
2013-01-28 16:37:03 -05:00
3e3fda589b
merge up to 3.4.4-release
2013-01-18 16:37:07 -05:00
841dc5da2e
merge up to 3.4.4
2013-01-17 13:54:39 -05:00
30b48351f9
OPEN-161 Typo in the header guard.
2013-01-16 19:19:19 -05:00
4de7c27d93
Merge in viewer-development
2013-01-14 09:31:57 -08:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
b75fc0af89
merge up to 3.4.4 beta
2013-01-04 10:23:22 -05:00
584b615c34
merge changes for storm-1918
2013-01-04 10:21:00 -05:00
aa3a65f5aa
MAINT-2087 Cleanup XML changes from new preferences hash marks
2012-12-12 13:58:24 -06:00
ee8240447b
Add myself as a contributor
2012-12-06 19:00:03 -08:00
ce46d524ac
merge changes for storm-1919
2012-11-27 11:20:09 -05:00
cceeacc726
merge storm-1855 to latest viewer-development
2012-11-27 11:18:52 -05:00
b70cc0ba53
STORM-1919: Fixed snapping of rotation in the edge-on case
...
Simply had to guard the snapping code, making sure that the last "else" case was preserved when either the outer or the inner tests failed.
2012-11-26 18:39:37 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
b8e036dff5
STORM-1918 Part of the group notice attachment box does not allow dropping of assets.
2012-11-13 12:15:36 -05:00
60f69c383c
merge changes for storm-1892
2012-11-09 15:21:46 -05:00
8695619c82
merge changes for storm-1894
2012-11-09 15:15:28 -05:00
07cc38e9cb
STORM-1855: Improve performance of pasting large blocks of text in the script editor
2012-11-09 15:12:15 -05:00
2fd843c118
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
378e9528d4
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
9db74ae962
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
6c989a692d
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
c94756d92c
merge up to 3.4.0-release
2012-09-24 09:19:53 -04:00
005cd40247
STORM-1911: Go-to line function for the internal LSL script editor
2012-09-19 00:49:34 +02:00
80ae45238b
STORM-1910: Adds the count of groups and the remaining free group slots to the group list
2012-09-13 23:01:14 +02:00
185169cbbe
correct attribution for STORM-1868 (add Wolf Loonie)
2012-11-15 11:29:38 -05:00
695c4135ff
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-07 14:47:24 -04:00
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
Cinder Roxley