Tank_Master
8dff6606ae
STORM-959 Syntax highlighting for LSL multi-line comments. (from Ima Mechanique)
2011-10-29 21:45:15 -07:00
Arrehn
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
Oz Linden
77dc594e79
merge back late changes and tags from release branch
2011-10-17 16:19:57 -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
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
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
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