836ad301dc
merge changes for STORM-1948
2013-07-02 12:07:00 -04:00
35b27d558c
Merged lindenlab/viewer-release into default
2013-06-27 21:35:23 -06:00
97ed20a12b
Merged lindenlab/viewer-release into default
2013-06-27 21:31:48 -06:00
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
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
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
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
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
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
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
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
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
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
Oz Linden