Oz Linden
6807214bb9
merge changes for 3.5.0-beta3 (chui)
2013-03-19 15:25:22 -04:00
Oz Linden
ca17a74f18
merge changes for storm-1910
2013-03-19 15:21:16 -04:00
Oz Linden
ed7785bf97
merge up to 3.5.0-beta3 (chui)
2013-03-18 14:30:57 -04:00
Oz Linden
a625dbe35e
merge changes for 3.5.0-beta3
2013-03-15 15:42:21 -04:00
Oz Linden
75722baf29
merge changes for latest viewer-development
2013-03-13 15:15:15 -04:00
merov_linden
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
Graham Madarasz (Graham)
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
Graham Madarasz (Graham)
2e8b2558b4
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
2013-03-07 14:13:14 -08:00
Graham Madarasz (Graham)
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
Graham Madarasz (Graham)
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
Ansariel
f3025b0ae4
STORM-1933: Certain show in search categories for parcels will not stay selected
2013-02-23 02:01:07 +01:00
Ansariel
bf981db8b9
STORM-1932: Region/Estate floater contains unlocalizable strings
2013-02-23 00:12:08 +01:00
Ansariel
2474385a2a
STORM-1931: Added option to disable chat animations (say/whisper/shout)
2013-02-22 11:19:51 +01:00
callum_linden
010c87788d
Merge with HEAD
2013-02-15 10:15:58 -08:00
Dave Parks
cc260a6356
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-02-14 12:16:37 -06:00
Dave Parks
bc60d34f68
MAINT-2368 Pull in Firestorm fix for textures unloading behind you.
2013-02-14 12:15:59 -06:00
Oz Linden
c880c961bb
merge changes for 3.4.5
2013-02-14 09:05:55 -05:00
simon@Simon-PC.lindenlab.com
94ae64d6fd
Pull and merge viewer-release
2013-02-12 14:59:59 -08:00
Oz Linden
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
callum_linden
bfffedaec9
Trivial whitespace change to ignite new Team City build after some admin work
2013-02-06 15:09:44 -08:00
callum_linden
5766592712
Updated contributions text file with people who worked on the FMOD upgrade patch
2013-02-06 13:57:51 -08:00
Ima Mechanique
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
Whirly
0908b60c1c
STORM-1930 Quality & Speed slider has Ultra label where High should be.
2013-02-01 08:10:16 +00:00
Jonathan Yap
0092ec9bd9
STORM-1929 Top bar: speaker icon clipped, overlapping UI elements
2013-01-28 16:37:03 -05:00
Oz Linden
3e3fda589b
merge up to 3.4.4-release
2013-01-18 16:37:07 -05:00
Oz Linden
841dc5da2e
merge up to 3.4.4
2013-01-17 13:54:39 -05:00
Jonathan Yap
30b48351f9
OPEN-161 Typo in the header guard.
2013-01-16 19:19:19 -05:00
simon@Simon-PC.lindenlab.com
4de7c27d93
Merge in viewer-development
2013-01-14 09:31:57 -08:00
Dave Parks
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
Oz Linden
b75fc0af89
merge up to 3.4.4 beta
2013-01-04 10:23:22 -05:00
Oz Linden
584b615c34
merge changes for storm-1918
2013-01-04 10:21:00 -05:00
Dave Parks
aa3a65f5aa
MAINT-2087 Cleanup XML changes from new preferences hash marks
2012-12-12 13:58:24 -06:00
Tank_Master
ee8240447b
Add myself as a contributor
2012-12-06 19:00:03 -08:00
Oz Linden
ce46d524ac
merge changes for storm-1919
2012-11-27 11:20:09 -05:00
Oz Linden
cceeacc726
merge storm-1855 to latest viewer-development
2012-11-27 11:18:52 -05:00
Ricky Curtice
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
Dave Parks
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
Jonathan Yap
b8e036dff5
STORM-1918 Part of the group notice attachment box does not allow dropping of assets.
2012-11-13 12:15:36 -05:00
Oz Linden
60f69c383c
merge changes for storm-1892
2012-11-09 15:21:46 -05:00
Oz Linden
8695619c82
merge changes for storm-1894
2012-11-09 15:15:28 -05:00
Oz Linden
07cc38e9cb
STORM-1855: Improve performance of pasting large blocks of text in the script editor
2012-11-09 15:12:15 -05:00
Dave Parks
2fd843c118
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
Dave Parks
378e9528d4
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
Dave Parks
9db74ae962
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
Dave Parks
6c989a692d
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
Oz Linden
c94756d92c
merge up to 3.4.0-release
2012-09-24 09:19:53 -04:00
MartinRJ Fayray
005cd40247
STORM-1911: Go-to line function for the internal LSL script editor
2012-09-19 00:49:34 +02:00
LanceCorrimal
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
Oz Linden
185169cbbe
correct attribution for STORM-1868 (add Wolf Loonie)
2012-11-15 11:29:38 -05:00
Nat Goodspeed
695c4135ff
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-07 14:47:24 -04:00
Dave Parks
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
Oz Linden
43d29ea03e
merge changes for DRTVWR-202
2012-08-22 17:11:10 -04:00
Whirly
6e44b8342a
VWR-29543 In merchant outbox "create a Marketplace store" link opens wrong article in KB.
2012-08-21 12:30:00 +01:00
Oz Linden
0c903609d4
merge changes for storm-1895
2012-08-16 10:55:31 -04:00
Oz Linden
39d79080c0
merge changes for storm-1899
2012-08-16 10:33:42 -04:00
Oz Linden
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
Ansariel
08f35b6a14
STORM-1899: Avatar hand poses randomly get stuck in spread position
2012-07-26 17:07:12 +02:00
callum_linden
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
Oz Linden
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
Oz Linden
5ed8ec6ca4
merge up to 3.3.3-release
2012-06-27 08:10:29 -04:00
Whirly
b4e1d03584
STORM-1895 - Rename Delay Restart button to Cancel Restart
2012-06-26 15:37:31 +01:00
Jonathan Yap
75a76491ed
STORM-1894 UIScaleFactor: raise limit from 1.4 to at least 1.5
2012-06-25 14:21:19 -04:00
Jonathan Yap
ad8478c470
STORM-1892 Add Apply button to the edit content permission floater
2012-06-23 19:28:28 -04:00
Oz Linden
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
Oz Linden
e30fbb2837
merge changes for open-140
2012-06-19 12:36:47 -04:00
Oz Linden
d1ac85a589
merge changes for open-142
2012-06-19 12:34:03 -04:00
Oz Linden
dad85ce554
merge changes for storm-1868
2012-06-18 14:01:18 -04:00
Oz Linden
bbf8137ce5
credit for STORM-1844
2012-06-18 13:59:22 -04:00
Oz Linden
83ddded5ab
merge changes for storm-1877
2012-06-18 13:56:43 -04:00
Oz Linden
d36f74ba33
merge changes for storm-1843
2012-06-18 12:50:15 -04:00
Oz Linden
9b2daf4b19
add credit in contributions.txt
2012-06-18 12:48:57 -04:00
Oz Linden
6c0922df91
add to contributions.txt
2012-06-15 08:39:11 -04:00
Tank_Master
361a413d25
Add myself to contributions.txt
2012-06-12 09:06:12 -07:00
Tank_Master
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
Jonathan Yap
a64bb32b05
STORM-1877 Missing entries in strings.xml for some Inventory folder names
2012-06-08 18:05:31 -04:00
Jonathan Yap
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
Oz Linden
3ebfcd7054
merge changes for DRTVWR-163
2012-06-08 09:00:05 -04:00
Oz Linden
ada746bd2a
merge changes for DRTVWR-161
2012-06-06 16:44:55 -04:00
Oz Linden
a4452eef27
merge changes for storm-1872
2012-06-05 10:44:02 -04:00
Oz Linden
8276228600
merge changes for storm-1870
2012-06-05 10:43:35 -04:00
Oz Linden
c432ee1581
merge changes for storm-1845
2012-06-05 10:43:14 -04:00
Oz Linden
2ad0bc334d
storm-1703: update license statements
2012-06-05 10:02:48 -04:00
Oz Linden
13ca132037
merge changes for DRTVWR-157
2012-06-04 17:07:27 -04:00
MartinRJ
f9879b8ea9
STORM-1845: Move "Show HUD Attachments" to Me menu
2012-06-04 17:01:32 -04:00
Jonathan Yap
c2f0a8ef02
STORM-1872 A line break is missing in ..\app_settings\settings.xml
2012-06-04 16:23:16 -04:00
Jonathan Yap
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
Jonathan Yap
f58cfdac22
STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-01 16:01:40 -04:00
Oz Linden
98457f8455
merge changes for storm-1852
2012-05-30 14:27:59 -04:00
Oz Linden
6fa682bb77
merge changes for storm-1858
2012-05-30 14:27:35 -04:00
Oz Linden
04d5a07949
merge changes for storm-1862
2012-05-30 14:26:20 -04:00
Oz Linden
dd0c04b864
merge changes for storm-1860
2012-05-30 14:09:35 -04:00
Tank_Master
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
Oz Linden
a491324677
merge up to latest viewer-release
2012-05-26 17:06:07 -04:00
Oz Linden
dbac37dcb5
merge latest viewer-release
2012-05-26 16:12:33 -04:00
Oz Linden
6525fc4a4f
merge changes for DRTVWR-147
2012-05-22 05:51:20 -04:00
Hitomi Tiponi
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
Jonathan Yap
dd5d7fadca
STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard
2012-05-18 12:12:42 -04:00
Jonathan Yap
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
Jonathan Yap
8593020037
STORM-1852 Altitude display stutters or is clamped when flying higher than 4096m
2012-05-11 11:33:03 -04:00
Oz Linden
790dfda434
merge changes for storm-1820
2012-05-01 13:27:34 -04:00
Oz Linden
0248aa5ec2
merge changes for storm-1839
2012-05-01 13:27:02 -04:00
Oz Linden
5d92c60a4a
merge changes for storm-1842
2012-05-01 13:26:20 -04:00
Boroondas Gupte
1b832eaa4b
OPEN-54: correct JsonCpp include path
2012-04-24 11:24:11 -04:00
Adam Moss
03442801bd
contributors.txt update.
2012-04-21 18:17:37 +01:00
Oz Linden
c7c7726c6f
merge changes for drtvwr-135
2012-04-13 17:11:19 -04:00
Zi Ree
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
Jonathan Yap
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
Oz Linden
564121fca4
merge changes for storm-1823
2012-04-02 09:56:40 -04:00
Oz Linden
e66817e6d7
merge changes for storm-1822
2012-04-02 09:56:11 -04:00
Oz Linden
86863af947
merge changes for storm-637
2012-04-02 09:53:06 -04:00
Jonathan Yap
98ce08c8fd
STORM-1820 Discoverability of the menu that opens the Block List is difficult
2012-03-30 18:06:21 -04:00
Nicky Perian
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
Nicky Perian
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
Vaalith Jinn
f71ca07998
storm-64: Local Textures
2012-04-02 09:34:14 -04:00
Jonathan Goodman
c7106a02b9
Merging latest changes for normalized blinn-phong.
2012-03-26 13:44:28 -04:00
Jonathan Yap
129a522235
STORM-1822 Change size of Block button in dialog boxes to help prevent accidental clicks
2012-03-22 12:29:03 -04:00
Oz Linden
8ce4be7688
merging up to latest viewer-development
2012-03-21 11:50:03 -04:00
Oz Linden
0a87371567
merge changes for vmrg-230
2012-03-09 12:56:48 -05:00
Oz Linden
eb7e48fc90
merge changes for storm-1808
2012-02-21 15:22:06 -05:00
Oz Linden
3be60824c8
merge changes for storm-1807
2012-02-21 15:20:20 -05:00
Oz Linden
f1c8674aa8
merge changes for storm-1809
2012-02-21 15:19:12 -05:00
Oz Linden
57fe6f66f8
merge changes for storm-1810
2012-02-21 15:17:48 -05:00
Jonathan Yap
1daac72722
STORM-1812 Music stream does not always restart after teleporting
2012-02-15 08:05:28 -05:00
Oz Linden
381d5829db
merge changes for storm-1804
2012-02-09 11:54:31 -05:00
Oz Linden
cb6fe4b4e9
merge changes for storm-1803
2012-02-09 11:54:02 -05:00
Oz Linden
e836d90ebb
merge changes for storm-1795
2012-02-09 11:53:14 -05:00
Oz Linden
c2e39e9230
merge changes for storm-1741
2012-02-09 11:52:39 -05:00
Oz Linden
30fc66adf8
merge changes for storm-1718
2012-02-09 11:51:45 -05:00
Jonathan Yap
1f5c2c056f
STORM-1808 Indicate ability to build
2012-02-08 18:25:35 -05:00
Jonathan Yap
039c50f2b4
STORM-1807 Play animation floater 2nd play button active while animation is playing
2012-02-08 15:41:27 -05:00
Jonathan Yap
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
Jonathan Yap
bd1ea1b764
STORM-1810 Display Z coordinate in Script Error window
2012-02-08 13:02:46 -05:00
Oz Linden
d3cbcc58ef
merge changes for storm-1718
2012-02-06 15:52:58 -05:00
Oz Linden
df5b1ed85b
merge changes for storm-1804
2012-02-06 15:51:54 -05:00
Oz Linden
5b8bcee234
merge changes for storm-1793
2012-02-06 15:48:17 -05:00
Oz Linden
234fe401ec
merge changes for storm-1795
2012-02-06 15:47:08 -05:00
Oz Linden
8b29cd05a6
merge changes for storm-1803
2012-02-06 15:45:59 -05:00
Oz Linden
c0ede2d2b3
merge changes for storm-1741
2012-02-06 15:43:57 -05:00
Oz Linden
5b2dbbadf7
merge changes for latest viewer-development
2012-02-02 14:26:33 -05:00
Hitomi Tiponi
4f58bd82a3
STORM-1741 Collection of color and skinning issues
...
With help from Jonathan Yap
2012-01-31 13:06:53 -05:00
Jonathan Yap
439a7df6ba
STORM-637 Scripts Progress windows Missing
2012-01-30 16:12:40 -05:00
Jonathan Yap
619f737abb
STORM-1803 Adding raw anim file upload support
2012-01-29 15:34:51 -05:00
Jonathan Yap
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
Kitty Barnett
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
Oz Linden
e377182c04
merge changes for storm-1799
2012-01-23 14:17:21 -05:00
Oz Linden
f93126e1ea
merge changes for storm-1796
2012-01-23 14:15:55 -05:00
Jonathan Yap
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
Jonathan Yap
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
Jonathan Yap
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
Jonathan Yap
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
Jonathan Yap
7bc4085eb2
STORM-1788 Clarify wording in About Land->Access and tooltips (and similar Estate panel)
2012-01-10 12:03:20 -05:00
Oz Linden
0329025734
merge up to latest viewer-development
2012-01-09 09:05:14 -05:00
Oz Linden
f92fd78e74
merge changes for storm-1790
2012-01-04 10:46:12 -05:00
Oz Linden
988cb62d43
merge changes for storm-1727
2012-01-04 10:11:59 -05:00
Oz Linden
d0c7eaa7cf
merge changes for storm-1725
2012-01-04 09:33:50 -05:00
Oz Linden
97630acce0
merge changes for storm-1708
2012-01-04 09:32:38 -05:00
Jonathan Yap
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
Oz Linden
889d4d292b
merge up to latest viewer-development
2011-12-21 09:42:55 -05:00
Oz Linden
b022ebf13c
merge changes for storm-1734
2011-12-20 10:39:06 -05:00
Oz Linden
2667c6a80f
merge changes for storm-653 and storm-1737
2011-12-20 09:20:36 -05:00
Oz Linden
a336f1ee39
merge changes for storm-1737
2011-12-19 13:16:01 -05:00
Jonathan Yap
5226629883
STORM-1737 panel_edit_skin.xml uses confusing historical terminology
2011-12-18 10:29:05 -05:00
Jonathan Yap
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
Oz Linden
94673473ed
merge changes for storm-1653
2011-12-15 16:06:08 -05:00
Oz Linden
916c4a79e5
merge changes for storm-1731
2011-12-15 16:05:26 -05:00
Oz Linden
c0f5b24b54
merge changes for storm-1723
2011-12-15 16:04:40 -05:00
Oz Linden
1b6ee87bc8
merge changes for storm-1733
2011-12-15 16:03:34 -05:00
Alissa Sabre
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
Jonathan Yap
821c964230
STORM-1736 Cropped buttons in the bottom of the Ad-hoc floater
2011-12-14 17:44:10 -05:00
Jonathan Yap
fdc223287c
STORM-1734 Update contributions.txt with Storm jira number
2011-12-14 13:58:46 -05:00
Jonathan Yap
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
Oz Linden
457f150734
add project information to doxygen output main page, update license URLs
2011-12-14 12:25:31 -05:00
Jonathan Yap
7f85f6be6a
VWR-27832 L$ Transfer failures show alert as if successful
2011-12-12 20:07:34 -05:00
Jonathan Yap
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
Oz Linden
7457a3eb7a
merge changes for vmrg-199
2011-12-07 14:49:27 -05:00
Oz Linden
cbfec00c6e
merge changes for storm-1713
2011-12-06 14:00:22 -05:00
Oz Linden
4a0311f8c5
merge changes for storm-1712
2011-12-06 13:53:37 -05:00
Oz Linden
f54caff1e4
merge changes for storm-591
2011-12-06 13:52:26 -05:00
Jonathan Yap
fc671fa2b3
STORM-1728 Name truncation in the Region/Estate floater -> Covenant tab
2011-12-06 10:41:22 -05:00
Jonathan Yap
a78894285a
STORM-1725 Truncation of UI element Preferences->General->Busy mode response
2011-12-06 10:03:26 -05:00
Jonathan Yap
b89c1ac482
STORM-1727 Dates displayed incorrectly in group profile. year "2035"
2011-12-06 09:53:09 -05:00
Ansariel
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
Jonathan Yap
6e2b3fd634
STORM-1712 Do not sort recent speakers list if mouse is hovered over it
2011-12-02 18:48:43 -05:00
Ansariel Hiller
9a79b6f330
storm-1717: fix avatar names in object details floater
2011-12-02 14:37:23 -05:00
Oz Linden
34b44fe714
merge changes for storm-1719
2011-12-01 13:27:27 -05:00
Jonathan Yap
47e493f5f8
STORM-1721 Set UI Size to Default Option Duplicated in Advanced Menu
2011-12-01 09:49:06 -05:00
Jonathan Yap
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
Oz Linden
d22584bfe5
merge changes for vmrg-193
2011-11-28 11:02:15 -05:00
Brad Payne (Vir Linden)
5374e544ed
merge
2011-11-28 10:13:34 -05:00
Oz Linden
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
Oz Linden
e93b5b0d22
merge changes for storm-1684
2011-11-21 09:20:49 -05:00
Tofu Buzzard
b901998c6f
Add "Use Region Settings" to World->Sun menu
2011-11-21 09:20:09 -05:00
Oz Linden
052d8a8f2e
merge changes for storm-1679
2011-11-21 09:11:01 -05:00
Ima Mechanique
b28492fbff
STORM-1708 Adding ability to save/load scripts from file.
2011-11-17 23:17:26 +00:00
Ansariel Hiller
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
Oz Linden
281fde3c48
merge changes for storm-1105
2011-11-08 14:08:01 -05:00
Oz Linden
d3eb5ac875
merge changes for storm-1222
2011-11-08 14:07:04 -05:00
Oz Linden
49f2c4f78a
merge changes for storm-1674
2011-11-08 14:05:16 -05:00
Oz Linden
450dc71396
merge changes for storm-1659
2011-11-08 14:04:17 -05:00
Jonathan Yap
089a9ced0d
STORM-1679 Avatar Draw Weight number is always red
2011-11-03 08:25:34 -04:00
Dave Parks
55f69de90c
merge
2011-11-02 11:46:18 -05:00
Jonathan Yap
403cdb863d
STORM-1222 System message when trying to teleport back to Welcome Island isn´t localized
2011-10-28 22:04:20 -04:00
Jonathan Yap
c8f88d1d59
STORM-1674 Set Help ID for new Translaton Settings floater
2011-10-28 19:04:20 -04:00
Jonathan Yap
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
Jonathan Yap
8b0d63f343
STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting for data)
2011-10-28 07:27:54 -04:00
Jonathan Yap
252f851741
STORM-1659 dates reported as "2035" within groups
2011-10-27 13:36:32 -04:00
Jonathan Yap
db643d1881
STORM-1653 Group notices sent by muted residents are still displayed
2011-10-26 11:21:01 -04:00
niel@nirvana-win7hp.planescape.home
4fd9a53115
Merge STORM-959
2011-10-26 01:42:26 +01:00
niel@nirvana-win7hp.planescape.home
42c166e451
STORM-959 Adding syntax highlighting for /* */ style comments
2011-10-26 01:38:29 +01:00
Dave Parks
e2b52009ea
merge
2011-10-24 15:32:58 -05:00
Oz Linden
255eebf116
merge changes for storm-1638
2011-10-21 06:48:24 -04:00
Oz Linden
140ce422b8
merge changes for storm-976
2011-10-20 16:45:00 -04:00
Oz Linden
a61401140e
merge changes for storm-1642
2011-10-20 15:04:30 -04:00
Oz Linden
78900b4643
merge changes for storm-910
2011-10-20 15:03:42 -04:00
Dave Parks
f19f43c746
merge
2011-10-19 16:21:18 -05:00
Oz Linden
77dc594e79
merge back late changes and tags from release branch
2011-10-17 16:19:57 -04:00
Vex Streeter
9cb8e959af
STORM-1642 Typos in keywords.ini
...
With repo-making help from Jonathan Yap
2011-10-14 20:49:46 -04:00
Dave Parks
984feefbec
merge
2011-10-14 17:56:55 -05:00
Jonathan Yap
04eb6f0ef4
STORM-910 Text formatting issues in Land/Assets accordion
2011-10-14 17:55:04 -04:00
Dave Parks
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
Dave Parks
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
Oz Linden
33dcb30166
merge changes for storm-1639
2011-10-13 08:01:28 -04:00
Oz Linden
7a9fd689bd
merge changes for storm-1579
2011-10-13 07:57:24 -04:00
Jonathan Yap
5cfd34df90
STORM-976 Object muted by name still displays notification message when clicked
2011-10-11 18:18:02 -04:00
Oz Linden
be251b06eb
merge changes for open-38
2011-10-11 09:31:09 -04:00
Jonathan Yap
0a3628b66d
STORM-1639 Duplicated XUI ID: floater_build_options.xml
2011-10-07 14:35:54 -04:00
Jonathan Yap
aa341e918e
Duplicated XUI ID: floater_model_wizard.xml
2011-10-07 11:28:37 -04:00
Oz Linden
df2e5fa37e
merge changes for vwr-27026
2011-10-06 20:19:36 -04:00
Oz Linden
a41ca2c34d
merge fixes for storm-1602 up to latest viewer-development
2011-10-06 16:39:23 -04:00
Oz Linden
fd91f09e19
STORM-1602 improvements from leliel Mirihi, and more optimizations
2011-10-06 16:37:11 -04:00
Dave Parks
754ce2be40
SH-2477 Integrate Tofu's FXAA edge threshold tweaks
2011-09-29 20:20:56 -05:00
jaeger_reg@tank-pc.ftrdhcpuser.net
c0410361de
Statistic floater update to improve displayed info.
2011-09-26 13:16:17 -07:00
Oz Linden
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
Oz Linden
b2d20f5a98
merge changes for storm-1532
2011-09-14 08:33:25 -04:00
Oz Linden
48e1a563ab
VWR-26622: correct recognition of Intel Mobile 4 Series GPUs
2011-09-13 12:40:37 -04:00
Jonathan Yap
77f89dbaf2
STORM-1579 xml formatting issues in Region/Estate floater
...
Add entry to contributions.txt
2011-09-12 12:29:36 -04:00
Oz Linden
84a53eb547
merge changes for storm-1297
2011-09-12 11:31:40 -04:00
Oz Linden
0ab6eee099
merge changes for storm-1027
2011-09-02 13:48:29 -04:00
Oz Linden
8efd992d50
correct DOS line endings
2011-09-02 13:48:01 -04:00
Xiaohong Bao
1379188c82
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-31 11:15:02 -06:00
Xiaohong Bao
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
Oz Linden
ba6f7883ab
update list of translators
2011-08-31 10:35:49 -04:00
Oz Linden
e62a4d4ec1
merge changes for storm-1567
2011-08-31 09:07:32 -04:00
Oz Linden
ee4fc00a27
merge changes for storm-1572
2011-08-31 09:05:49 -04:00
Oz Linden
3416cf0da8
merge changes for storm-1574
2011-08-31 09:05:06 -04:00
Oz Linden
a2c5944666
merge changes for storm-1522
2011-08-31 09:03:13 -04:00
Oz Linden
f6505dc261
add missing contribution record
2011-08-31 08:59:20 -04:00
Vadim ProductEngine
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
Jonathan Yap
36f9b513b0
STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is truncated
2011-08-29 17:36:37 -04:00
Jonathan Yap
b918ef5e6f
STORM-1574 Binary data in panel_login.xml -- filled up-pointing triangle.
2011-08-26 15:26:17 -04:00
Oz Linden
f603d14339
merge changes for storm-1276
2011-08-25 13:24:48 -04:00
Jonathan Yap
d254c7eb54
STORM-1572 XML issues for Basic/Advanced Mode button in menu bar
2011-08-24 18:13:38 -04:00
Jonathan Yap
541e26d947
STORM-1567 Mute button for llDialog popup
...
Updating patch to current version of viewer-development
2011-08-23 07:55:34 -04:00
Richard Nelson
cc4e708848
merge
2011-08-18 14:16:06 -07:00
Armin Weatherwax
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
callum
a666878a01
EXP-700 (VWR-24502) - added Satomi Ahn's name to list of contributors
2011-08-17 12:11:58 -07:00
Oz Linden
91ac6b16f5
merge changes for VWR-25588
2011-08-15 09:43:38 -04:00
Oz Linden
4c0565f381
merge changes for STORM-1534
2011-08-11 16:30:15 -04:00
Oz Linden
608403a846
merge changes for vwr-26458
2011-08-09 10:22:04 -04:00
Oz Linden
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
Oz Linden
732a6e3c81
STORM-1534: Derive Credits in About Second Life from doc/ sources
2011-08-02 13:42:41 -04:00
Boroondas Gupte
8cc315a199
VWR-26458: fixed typo in German translation: "Hilmmel" instead of "Himmel"
2011-07-22 00:14:03 +02:00
Boroondas Gupte
5774bac296
merged VWR-25588 fix (hovertext occlusion)
2011-07-21 11:02:30 +02:00
Boroondas Gupte
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
Xiaohong Bao
83e48f4a51
Merge
2011-07-19 23:48:11 -06:00
Oz Linden
181c34c984
merge changes for vwr-26066
2011-07-19 15:43:38 -04:00
Xiaohong Bao
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
Oz Linden
1f369cad59
merge changes for open-99
2011-07-13 17:43:45 -04:00
Oz Linden
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
Oz Linden
121d004b32
merge changes for storm-1459
2011-07-11 16:51:06 -04:00
Oz Linden
7b9fc42941
merge changes for storm-1325
2011-07-11 16:49:29 -04:00
Oz Linden
093fdcfcd3
merge changes for storm-1489
2011-07-08 20:16:35 -04:00
Oz Linden
553e5001e9
merge changes for storm-1462
2011-07-08 12:56:00 -04:00
Richard Linden
88a90aabcb
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-07 13:34:13 -07:00
Oz Linden
f07173a968
merge changes for storm-1452
2011-06-30 06:40:46 -04:00
Oz Linden
b278b61f4e
merge changes for storm-1406
2011-06-30 06:39:48 -04:00
Oz Linden
c8c9384949
merge changes for storm-1327
2011-06-30 06:38:39 -04:00
Oz Linden
ce93fc7fd5
merge changes for storm-1396
2011-06-30 06:37:25 -04:00
Oz Linden
a80c79097d
merge changes for storm-457
2011-06-30 06:36:25 -04:00
Kadah_Coba
c47d42d945
STORM-1315 Ability to do simple math in numeric edit fields
2011-06-29 23:40:20 -07:00
Oz Linden
f6ddd71214
merge changes for storm-1392
2011-06-29 21:21:36 -04:00
Jonathan Yap
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
Richard Linden
8a4b3e33cd
EXP-961 FIX Keyboard definition file keys.xml contains invalid XML markup
2011-06-29 13:13:10 -07:00
Jonathan Yap
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
Jonathan Yap
68c8248fb9
STORM-1459 "Wearing Tab" - Add ability to copy displayed inventory names to clipboard
2011-06-29 10:28:06 -04:00
Oz Linden
a300902494
merge changes for storm-1302
2011-06-29 09:54:27 -04:00
Oz Linden
4425f9b821
merge changes for storm-1326
2011-06-29 09:53:34 -04:00
Oz Linden
060d2f3c5e
merge changes for storm-1292
2011-06-29 09:52:43 -04:00
Oz Linden
2ee2f1d6ff
merge changes for vwr-25480
2011-06-28 09:21:38 -04:00
Oz Linden
b24f9295a2
merge changes for storm-1393
2011-06-28 09:20:53 -04:00
Oz Linden
23d3b834bb
merge changes for storm-1334
2011-06-28 09:20:13 -04:00
Tankmaster Finesmith
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
Jonathan Yap
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
Alexandrea Fride
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
Alexandrea Fride
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
Jonathan Yap
cce5dd64e0
STORM-1276 [MULTIPLE LANGS] Text truncation in Email Snapshot floater in Spanish localization
2011-06-26 04:59:02 -04:00
Jonathan Yap
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
Jonathan Yap
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
Jonathan Yap
d66545d17f
STORM-1326 [ALL LANGS] (Spanish) [HARDCODED] Selling land, advice with "Anyone" in English.
2011-06-25 11:08:36 -04:00
Boroondas Gupte
0710fea048
merged OPEN-99: use -march=pentium* for 32-bit builds only
2011-06-21 00:20:03 +02:00
Boroondas Gupte
0488142b93
OPEN-99: use -march=pentium3 for 32-bit builds only
2011-06-21 00:09:17 +02:00
Boroondas Gupte
482a19c251
merged OPEN-38 (Aleric's standalone fixes for viewer-autobuild)
2011-06-20 18:14:06 +02:00
Wolfpup Lowenhar
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
Thickbrick Sleaford
1f15f91d18
contributions.txt for STORM-1325
2011-06-20 16:44:48 +03:00
Boroondas Gupte
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
Boroondas Gupte
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
Jonathan Yap
173ef3b2c0
STORM-1396 Storm-787 (mute gestures) also mutes sounds from objects
2011-06-19 07:07:31 -04:00
Jonathan Yap
b91205ccf0
STORM-1392 Add Nearby Voice to the Communicate menu
2011-06-18 07:00:55 -04:00
Oz Linden
624b050589
merge changes for storm-1103
2011-06-15 11:58:50 -04:00
Oz Linden
26e1f92c83
merge changes for storm-1313
2011-06-15 11:58:01 -04:00
Oz Linden
81afbd5b29
merge changes for storm-787
2011-06-15 11:57:13 -04:00
Oz Linden
83cb59e45b
merge changes for storm-899
2011-06-15 11:56:18 -04:00
Oz Linden
b6e69570dc
merge changes for storm-1273
2011-06-15 11:55:12 -04:00
Jonathan Yap
e2a531791e
STORM-1334 Console debug data scrolls away too quickly and is hard to read
2011-06-15 07:02:28 -04:00
Jonathan Yap
ac50481513
STORM-787 Mute Gestures Button
2011-06-12 16:00:33 -04:00
Ansariel Hiller
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
Oz Linden
68a7c4cb83
merge changes for vwr-25654
2011-06-07 18:58:28 -04:00
Jonathan Yap
cc7a041bfe
Fix for Storm-956 crashes viewer when connected to non-LL grids
2011-06-03 14:41:08 -04:00
Jonathan Yap
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
Jonathan Yap
9ecc872b73
STORM-1273 Duplicate entries in settings.xml
2011-05-26 05:43:35 -04:00
Oz Linden
fd427f0ab9
merge changes for storm-1100
2011-05-19 12:26:57 -04:00
Oz Linden
78cad51818
merge changes for STORM-1259 and STORM-1175
2011-05-19 12:07:41 -04:00
Oz Linden
35f394cd63
merge changes for storm-859
2011-05-18 18:24:13 -04:00
Oz Linden
7713a84777
merge changes for storm-1175
2011-05-18 09:48:46 -04:00
Oz Linden
2de13f8070
merge changes for storm-1259
2011-05-18 09:46:28 -04:00
Oz Linden
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
Jonathan Yap
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
Wolfpup Lowenhar
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
Oz Linden
66c078de5e
merge up to latest viewer-development
2011-05-13 13:28:51 -04:00
Oz Linden
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
Dave Parks
93696ac019
merge
2011-05-12 17:39:08 -05:00
Ima Mechanique
ad0cb157fe
STORM-1175 Fixing close button, for Custom Port warning, in Preferences => Setup => Network.
2011-05-12 11:42:46 +01:00
Oz Linden
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
Jonathan Yap
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
Oz Linden
0ca94ddec2
merge changes for open-61
2011-05-04 19:02:06 -04:00
Dave Parks
a25f898703
merge
2011-05-02 14:52:12 -05:00
Oz Linden
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
Oz Linden
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
Oz Linden
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
Oz Linden
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
Boroondas Gupte
8fae347ba9
VWR-25654 FIXED memory leak in LLTranslate::getTranslateUrl
2011-05-01 22:04:06 +02:00
Ricky Curtice
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
Boroondas Gupte
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
Dave Parks
764412f9b5
merge
2011-04-22 11:50:19 -05:00
Oz Linden
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
Dave Parks
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
Ima Mechanique
4906f4644f
OPEN-61 Adding locations that redistributable package installs msvc* files.
2011-04-21 22:11:48 +01:00
Oz Linden
252cb50c38
merge changes for storm-1088
2011-04-20 20:21:55 -04:00
Oz Linden
47b8d252ff
corrected issue in doc/contributions.txt
2011-04-20 07:13:53 -04:00
Dave Parks
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
Dave Parks
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
Siana Gearz
26b15973af
STORM-1088: fix loading of winmm.dll
2011-04-17 08:04:02 -04:00
Dave Parks
af6133dfa5
merge
2011-04-15 14:13:57 -05:00
Jonathan Yap
04f79f6358
STORM-956 Ability to mute dialogs by muting object (or object owner)
2011-04-15 13:13:15 -04:00
Twisted_Laws
5e2b781e78
STORM-1103 Nearby sidebar minimap should be optional
2011-04-14 08:11:06 -04:00
Vadim ProductEngine
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
Jonathan Yap
efa26485df
STORM-1128 Sort the results of using search in the World Map
2011-04-13 15:09:44 -04:00
Oz Linden
88a7262340
merge changes for storm-1098
2011-04-12 20:38:04 -04:00
Oz Linden
c857064af2
merge changes for storm-1101
2011-04-12 20:35:33 -04:00
Oz Linden
3e7481064f
fix contributions.txt whitespace
2011-04-09 18:40:35 -04:00
Thickbrick Sleaford
ab483c6e7c
STORM-1147: fix skin-tight clothing
2011-04-09 17:10:09 -04:00
Oz Linden
51b75b8832
merge changes for storm-1108
2011-04-08 17:34:49 -04:00
Boroondas Gupte
34afe36c35
merged OPEN-38 (Aleric's standalone fixes for viewer-autobuild)
2011-04-07 16:46:57 +02:00
Oz Linden
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
Oz Linden
f41cbc0ac8
merge changes for storm-1094
2011-04-06 07:32:56 -04:00
Boroondas Gupte
13458a96c7
contributions.txt entry for OPEN-38
2011-04-06 03:33:53 +02:00
Wolfpup Lowenhar
3c5dc8b9d3
STORM-1098 : Made change to debug setting description for ShowNetStatus
2011-04-05 12:37:03 -04:00
Ricky Curtice
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
Loren Shih
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
Oz Linden
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
Oz Linden
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
Boroondas Gupte
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
Loren Shih
8ccf3fbe3b
Automated merge up from viewer-development into mesh-development
2011-03-31 16:40:57 -04:00
Oz Linden
a71e0b1862
pull latest changes from viewer-development
2011-03-30 17:37:19 -04:00
Oz Linden
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
Oz Linden
9c0757511e
merge changes for storm-1077
2011-03-29 19:19:24 -04:00
Jonathan Yap
567035a2f7
STORM-1094 Chat preferences > font size should increase size of input text in IM window
2011-03-25 17:58:20 -04:00
Jonathan Yap
c7cacf7d67
STORM-1108 Enable Hints menu entry/preference is confusing
2011-03-25 17:17:05 -04:00
LanceCorrimal
40e14802e3
forgot to update contributions.txt
2011-03-24 12:56:15 +01:00
Merov Linden
be545aa51b
STORM-1090 : add attribution for the fix to Nicky
2011-03-23 20:40:35 -07:00
Jonathan Yap
67561663da
STORM-1101 Using the -login parameter makes some keys and right click menus not work
2011-03-23 14:55:28 -04:00
Loren Shih
be553242ef
Automated merge up from viewer-development into mesh-development
2011-03-21 10:38:39 -04:00
Oz Linden
819c7f0dd2
document contributions from Nicky Perian
2011-03-20 07:48:29 -04:00
Boroondas Gupte
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
Jonathan Yap
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
Boroondas Gupte
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
Merov Linden
fef21534e9
OPEN-37 : pull into viewer-autobuild2010
2011-03-18 15:35:20 -07:00
Oz Linden
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
Wolfpup Lowenhar
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
Oz Linden
25b69823e6
merge changes for storm-1064
2011-03-16 21:24:21 -04:00
Jonathan Yap
d9015a836f
STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button"
2011-03-16 18:32:28 -04:00
Tofu Buzzard
2d29b51f64
merge
2011-03-14 18:18:33 -07:00
Loren Shih
13705596af
Automated merge up from viewer-development into mesh-development
2011-03-14 12:03:14 -04:00
Merov Linden
522af96aca
STORM-1001 : pull into viewer-development
2011-03-11 16:05:27 -08:00
Merov Linden
4790944923
STORM-1067 : pull into viewer-development
2011-03-11 16:04:17 -08:00
Merov Linden
8c20875323
STORM-1059 : pull into viewer-development
2011-03-11 16:02:40 -08:00
Merov Linden
22946d446e
STORM-1073 : pull into viewer-development
2011-03-11 16:01:21 -08:00
Merov Linden
d550a7e8bc
STORM-1020 : pull into viewer-development
2011-03-11 15:57:57 -08:00
Merov Linden
16443c4df3
STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett)
2011-03-11 15:09:44 -08:00
Oz Linden
4223ab9acf
sync up to latest viewer-development
2011-03-11 17:40:31 -05:00