Jonathan Yap
199e65a6c5
STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only.
2014-02-24 10:57:53 -05:00
Oz Linden
b0c255f4e6
merge up to 3.7.0-release and get unit test fixes
2014-02-11 09:20:58 -05:00
Jonathan Yap
61dde95630
STORM-1915 Add name to contributors
2014-02-10 20:19:54 -05:00
Oz Linden
8312517857
merge changes for storm-2011
2014-01-31 16:21:50 -05:00
Oz Linden
48dbcd1d43
STORM-2010: fix to AutoAcceptNewInventory
2014-01-29 18:16:04 -05:00
Ansariel
86676ec34b
STORM-2011: Group member lists not loading properly
2014-01-28 19:45:50 +01:00
Oz Linden
d8cc2476b3
merge changes for MAINT-3187
2014-01-24 15:00:52 -05:00
Oz Linden
b2cc4feed2
correct coding style problems, add contribution credit
2014-01-23 13:41:52 -05:00
Oz Linden
197db4976a
merge changes for 3.6.13-release
2014-01-23 11:07:32 -05:00
Oz Linden
c241bb2af8
merge changes for storm-1972
2014-01-22 17:14:13 -05:00
Ansariel
316bf51482
MAINT-3187: Name list controls do not properly resolve avatar names
2014-01-21 15:11:10 +01:00
Jonathan Yap
ebac8c0a2a
STORM-2007 Buy floater displays truncated names/permissions when object is set to sell original and sell copy.
2014-01-14 10:34:08 -05:00
Oz Linden
a25bcb8523
merge changes for storm-1980
2014-01-07 13:44:22 -05:00
Oz Linden
69c32b04cf
merge changes for 3.6.12-release
2014-01-07 11:39:06 -05:00
Oz Linden
30f0d61510
merge changes for 3.6.12-release
2014-01-03 12:14:03 -05:00
Oz Linden
94ac0ffdc3
merge changes for 3.6.12-release
2013-12-19 17:32:58 -05:00
Oz Linden
8b01fd42b0
merge changes from project qa viewer
2013-12-19 17:30:58 -05:00
Oz Linden
9f056c1ddd
merge changes for open-113
2013-12-17 11:16:02 -05:00
Oz Linden
e774431783
merge changes for storm-1993
2013-12-16 13:31:49 -05:00
Oz Linden
f1acdc56b2
merge changes for storm-1992
2013-12-16 13:30:56 -05:00
Oz Linden
8df635f8bf
merge changes for storm-1989
2013-12-16 13:30:00 -05:00
Oz Linden
01cdc87d05
merge changes for storm-1987
2013-12-16 13:29:12 -05:00
Oz Linden
a57bcc2790
merge changes for storm-1986
2013-12-16 13:28:05 -05:00
Oz Linden
36281d53ff
merge changes for storm-1981
2013-12-16 13:27:13 -05:00
Oz Linden
dec487cd7f
merge changes for 3.6.12-release
2013-12-12 15:51:43 -05:00
Jonathan Yap
81d1d427f1
OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers
2013-12-11 10:41:28 -05:00
Jonathan Yap
5b40445e66
STORM-1993 In the About Land floater only send object return time to server when it has been changed
2013-12-04 19:38:52 -05:00
Jonathan Yap
e390255de6
STORM-1992 'Open voice connection' and 'Expand participant list' buttons are overlapping each other in IM conversation after resizing.
2013-12-04 19:33:10 -05:00
Jonathan Yap
56f9b9c048
STORM-1989 Overlapping UI elements in Upload Model floater
2013-12-03 04:19:23 -05:00
Oz Linden
0c6d06692e
merge changes for storm-1987
2013-11-27 12:02:04 -05:00
Jonathan Yap
d533dcebf7
STORM-1987 Inconsistent menu naming and behavior in Places floater
2013-11-27 10:26:27 -05:00
Jonathan Yap
db8e4824e7
STORM-1986 Added right click Show on Map context menu for Inventory floater landmarks
...
Possible fix for BUG-4593
2013-11-26 19:43:15 -05:00
Oz Linden
ced4ccdbd2
merge changes for storm-1984
2013-11-26 19:18:04 -05:00
Oz Linden
fe3a930623
merge fix for STORM-1984
2013-11-26 16:09:43 -05:00
Jonathan Yap
6b1d835f95
STORM-1981 Rough initial changes for evaluation purposes.
2013-11-24 15:46:21 -05:00
Oz Linden
45bc601563
merge changes for 3.6.11-release
2013-11-21 14:08:38 -05:00
Oz Linden
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
Oz Linden
7f39d0472e
merge changes for STORM-1831
2013-11-18 13:51:24 -05:00
Oz Linden
84a96cdf0f
correct attribution for open-195
2013-11-18 11:33:58 -05:00
Ansariel
3358102462
STORM-1984: Mousing over UI elements does not make them light up
2013-11-14 22:13:15 +01:00
Oz Linden
f8846713ce
add open-195 to doc/contributions.txt
2013-11-14 09:16:34 -05:00
Ima Mechanique
bea2e9822b
Fixing some references to 'filename' I forgot to rename to mFullFileSpec.
2013-11-09 11:51:45 +00:00
Oz Linden
5ca4a4b8f3
merge changes for storm-1982
2013-11-05 13:53:23 -05:00
Jonathan Yap
2454bcc8db
STORM-=1982 Remove duplicate entry in settings.xml
2013-11-05 10:24:41 -05:00
Jonathan Yap
caaaa1e5e6
STORM-1980 Play sound for region restarting message
2013-11-05 10:01:41 -05:00
Ansariel
e3739edeff
BUG-3764: Groups count in groups list does not display if floater is resized
2013-11-02 21:57:06 +01:00
Oz Linden
d61c6ad48b
merge changes for storm-1975
2013-11-01 08:46:32 -04:00
Jonathan Yap
07c011bc9c
STORM-1975 IM windows occasionally report false typing status.
2013-10-29 15:12:39 -04:00
Tonya Souther
07b5e702e6
BUG-3968: do not wear an object when renaming in inventory
2013-10-29 13:59:21 -04:00
Oz Linden
994ecbed34
add credit for BUG-3863
2013-10-29 13:53:43 -04:00
Graham Linden
6480612a91
Merge 3.6.9 ShareStorm
2013-10-25 10:23:11 -07:00
Oz Linden
c9775dde62
merge up to 3.6.9-release
2013-10-23 13:05:59 -04:00
Merov Linden
62999da4d0
Pull merge from oz_linden/336-snowstorm
2013-10-17 13:05:08 -07:00
Oz Linden
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
Drake Arconis
cda6e4488a
STORM-1972 Add forgotten credit in contributions.txt
2013-10-11 18:40:35 -04:00
Ima Mechanique
0c1d6d7d9e
Merge v3.6.7 in
2013-10-04 20:47:54 +01:00
Oz Linden
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
Graham Linden
0103cac1dd
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
2013-09-26 11:44:40 -07:00
Oz Linden
6a9d23b71a
merge changes for open-189
2013-09-12 14:07:12 -04:00
Drake Arconis
0142a0c6a9
OPEN-189 Add missing header guard
2013-09-11 19:02:36 -04:00
Oz Linden
f70296ec68
merge changes for storm-1902
2013-09-11 15:25:24 -04:00
Oz Linden
f6bcf6dd39
merge changes for vwr-29543
2013-09-11 12:47:25 -04:00
ZaiLynch
f4d2e21f4f
Changing shortcut to toggle preference floater
2013-09-11 12:17:22 -04:00
Oz Linden
d53f9366d0
merge changes for storm-1888
2013-09-09 16:04:45 -04:00
simon
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
Graham Linden
2df58f775f
Merge viewer-release 3.6.6
2013-09-09 12:43:10 -07:00
Oz Linden
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
katharine@exodusviewer.com
2108e9de5b
OPEN-149: fix documentation of LLColor4 constructor for F32 vector
2013-09-04 16:37:33 -04:00
Oz Linden
1a72325ef1
merge changes for open-154
2013-09-04 16:15:15 -04:00
Oz Linden
96f0d930bc
merge changes for open-187
2013-09-04 09:18:53 -04:00
Nicky
5172d4edac
OPEN-187: Properly cleanup all allocated OpenSSL structures.
2013-09-03 13:50:35 -04:00
Oz Linden
f3043428b0
merge changes for storm-1933
2013-08-29 12:54:52 -04:00
Oz Linden
5b799244c3
merge changes for storm-1929
2013-08-28 13:05:07 -04:00
Oz Linden
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
simon
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
Oz Linden
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
Oz Linden
1e2a6ee3f4
merge changes for maint-2773
2013-08-22 14:39:40 -04:00
Ansariel
be07694b9c
MAINT-2773: Disable texture animation doesn't work
2013-08-22 00:51:15 +02:00
Oz Linden
ba248b8b5d
merge changes for storm-1953
2013-08-21 10:44:12 -04:00
Oz Linden
c15d2e87ac
merge changes for storm-1952
2013-08-21 10:40:57 -04:00
Oz Linden
c42a91421f
merge changes for 3.6.3-release
2013-08-20 10:37:10 -04:00
Oz Linden
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
Oz Linden
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
Oz Linden
731fe3e7c6
merge changes for 3.6.3-release
2013-08-19 15:14:23 -04:00
Oz Linden
d2b947c1fa
merge changes for STORM-1932
2013-08-14 18:12:01 -04:00
Nicky
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
Oz Linden
b75213b39a
open-185: remove duplicate gperftools entry in autobuild.xml
2013-08-05 11:19:54 -04:00
Oz Linden
91f7d0d154
merge changes for storm-1838
2013-07-29 15:19:54 -04:00
Oz Linden
fd3d20e20d
add credit for storm-1958
2013-07-29 14:49:19 -04:00
Jonathan Yap
22a931efad
STORM-1957 World Map - Land For Sale is missing L$ / sqm
2013-07-28 10:42:51 -04:00
Oz Linden
9f393c1d99
merge up to latest snowstorm integration branch
2013-07-24 14:40:23 -04:00
Oz Linden
f81e2ce680
credit Cinder with STORM-1951
2013-07-24 14:28:30 -04:00
Oz Linden
725288e93a
add contributions for Materials
2013-07-16 15:53:37 -04:00
Oz Linden
c18c1f2def
merge changes for storm-1952
2013-07-15 15:37:45 -04:00
Graham Linden
c50f44e04e
Merge viewer-release 3.6.5
2013-08-26 14:57:54 -07:00
Graham Linden
547fb5da61
Make sure TankMaster is in the contribs for STORM-1950
2013-08-22 17:38:55 -07:00
Oz Linden
ecb1e57326
merge changes for storm-1953
2013-07-02 12:55:52 -04:00
Oz Linden
836ad301dc
merge changes for STORM-1948
2013-07-02 12:07:00 -04:00
Cinder Roxley
35b27d558c
Merged lindenlab/viewer-release into default
2013-06-27 21:35:23 -06:00
Cinder Roxley
97ed20a12b
Merged lindenlab/viewer-release into default
2013-06-27 21:31:48 -06:00
Cinder Roxley
7e0bc07e5c
Merged lindenlab/viewer-release into default
2013-06-27 21:22:44 -06:00
Ima Mechanique
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Dave Parks
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
Oz Linden
1108cd0e5c
merge changes for 3.6.0-release
2013-06-19 17:56:43 -04:00
Geenz
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
Merov Linden
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
Oz Linden
e23228fef2
merge 3.5.0-release
2013-06-19 13:59:52 -04:00
Oz Linden
761bf254a4
merge changes for 3.6.0-release
2013-06-17 16:50:35 -04:00
Geenz
0af636e632
Merged with viewer-release
2013-06-17 04:39:47 -04:00
Jonathan Yap
9b23298970
STORM-1953 Notifications that involve deleting something -- errors in text
2013-06-13 15:40:12 -04:00
Oz Linden
2268bf3833
merge changes for 3.5.3-release
2013-06-13 15:28:13 -04:00
Cinders
4f7b8a7e86
STORM-1952: Add a confirmation modal when ejecting a member from a group
2013-06-11 18:54:54 -06:00
Oz Linden
a2fa9a2bc2
merge changes for 3.5.3-release
2013-06-06 16:46:31 -04:00
Dave Parks
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
maksymsproductengine
90a3285e26
CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
2013-05-31 20:05:12 +03:00
simon
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
simon
3698aece0d
Merge latest viewer-release
2013-05-29 14:37:22 -07:00
Serpentu
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
Cinders
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
Oz Linden
5758b9e304
merge changes for 3.5.3-release
2013-05-22 11:09:43 -04:00
Oz Linden
2df5b9caa6
BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.
2013-05-21 17:25:51 -04:00
Oz Linden
72e7269da3
merge changes for 3.5.2-release
2013-05-20 09:08:20 -04:00
Dave Parks
46eface63c
NORSPEC-181 Fix for performance regression.
2013-05-14 16:20:54 -05:00
Geenz
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
Cinders
38c1cd2d29
STORM-1948 - Fix for Set home to here - screen_home.bmp not saved
2013-05-13 17:18:38 -06:00
Oz Linden
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
simon
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
simon
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
simon
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
Oz Linden
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
simon
cf37c67764
Merge downstream code from viewer-bear
2013-04-30 10:02:05 -07:00
simon
35f7a75083
Merge in downstream code from viewer-beta
2013-04-29 15:12:54 -07:00
simon
5af5b49a62
Merge in downstream viewer-beta
2013-04-29 12:05:44 -07:00
Oz Linden
bfb1ab134f
merge changes for 3.5.1-beta3
2013-04-23 14:29:24 -04:00
Nyx Linden
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
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
Oz Linden
ed2b5da8f1
merge changes for DRTVWR-298
2013-04-18 14:55:28 -04:00
Nyx Linden
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
callum_linden
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
Oz Linden
2fde4a9ae5
merge changes for 3.5.0-beta7
2013-04-01 14:24:01 -04:00
Geenz
5098d43a9b
STORM-1941: Cocoa project viewer: some coordinate conversions are off (Katharine Berry)
2013-04-01 08:25:11 -04:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Oz Linden
76f8d755b0
merge changes for storm-1931
2013-03-25 15:37:45 -04:00
simon
a976f5c217
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
2013-03-25 12:19:02 -07:00
simon
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
Oz Linden
6f2fef886e
merge changes for storm-1911
2013-03-25 10:53:37 -04:00
Oz Linden
bd57150f13
merge changes for storm-1910
2013-03-20 16:37:00 -04:00
Oz Linden
4b1c1e4e02
merge changes for storm-1931
2013-03-20 15:33:09 -04:00
Simon Linden
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
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