Commit Graph

575 Commits (8a8e9ccdb67e7e8a492a4fe1505407ebe128ee18)

Author SHA1 Message Date
Dave Parks 55f69de90c merge 2011-11-02 11:46:18 -05: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