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
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
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
Merov Linden
005da00fff
STORM-1059 : Fix for cache purging (fix by Aleric)
2011-03-11 14:38:09 -08:00
Ricky Curtice
d4d292258e
Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
...
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
Ricky Curtice
c790866e46
Corrected a call to the mac-specific command "Rez" that had the wrong case. This is only an issue on Macs that have a case-sensitive root filesystem.
2011-03-10 12:06:59 -08:00
Jonathan Yap
65bdb53753
STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall
2011-03-10 06:44:03 -05:00
Tofu Buzzard
63636e8cea
merge
2011-03-09 10:56:03 -08:00
Loren Shih
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
Merov Linden
cd3b76cb52
STORM-10140 : pull into viewer-development
2011-03-08 16:12:05 -08:00
Merov Linden
0bc84cea2e
STORM-990 : pull into viewer-development
2011-03-08 16:07:52 -08:00
Merov Linden
be9bae601c
STORM-1045 : pull into viewer-development
2011-03-07 14:31:09 -08:00
Jonathan Yap
4d8244573c
STORM-1040 Text that shows what Beacons you are viewing is always in English
2011-03-04 08:46:45 -05:00
Vadim ProductEngine
0247cd6aeb
STORM-236 FIXED Allow the "Speak" button to be removed, like other buttons.
...
Cumulative diff of changes made by Wolfpup, Richard and me.
Description:
* Ability to hide the Speak button with the bottom tray context menu.
* Made the chat input resize handle visible, so that the feature is easily discoverable.
* Applied Richard's fix to layout panel resizing logic.
2011-03-03 20:49:42 +02:00
Oz Linden
64c07135ba
merge up from viewer-development
2011-03-03 07:20:04 -05:00
Merov Linden
2ef66a7cfa
STORM-954 : pull into viewer-development
2011-03-01 12:02:14 -08:00
Merov Linden
4e3068fcd4
STORM-1024 : pull into viewer-development
2011-03-01 11:53:47 -08:00
Merov Linden
f86e112556
STORM-977 : pull into viewer-development
2011-03-01 11:50:12 -08:00
Tofu Buzzard
6fa702719c
merge
2011-02-28 13:02:15 -08:00
Loren Shih
dc3823b629
Automated merge up from viewer-development into mesh-development
2011-02-28 11:05:33 -05:00
Jonathan Yap
513fdff9cd
STORM-990 merge with current v-d & fixed merge conflict
2011-02-25 20:21:54 -05:00
Merov Linden
9962560f57
STORM-980 : pull into viewer-development
2011-02-25 15:44:38 -08:00
Merov Linden
8976c93b5c
STORM-974 : pull into viewer-development
2011-02-25 15:42:07 -08:00
Merov Linden
b9c6c9d273
STORM-979 : pull into viewer-development
2011-02-25 15:39:01 -08:00
Jonathan Yap
5b90db03d7
STORM-1020 It is sometimes necessary to press ALT+CTRL+D twice to get the Debug menu on the login screen
2011-02-23 18:51:29 -05:00
Xiaohong Bao
95838efeaa
Merge
2011-02-23 14:39:42 -07:00
Robin Cornelius
668307e4e3
STORM-1019 Add ability to display beacons for Media on a Prim objects
...
Changes merged into viewer 2 by Jonathan Yap
2011-02-23 15:50:55 -05:00
Xiaohong Bao
29415d1407
Merge
2011-02-23 13:48:35 -07:00
Ardy Lay
561e050474
VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat history
...
* Clean up changes based upon feedback from reviewers.
* Improve comment based upon feedback from reviewers.
2011-02-17 20:59:33 -06:00
Tofu Buzzard
03c738d0c9
merge
2011-02-17 12:14:46 -08:00
Loren Shih
b1e39f8544
Mesh-development work in progress
2011-02-17 10:26:28 -05:00
Oz Linden
bf7801aeec
merging in latest viewer-development
2011-02-16 18:18:34 -05:00
Oz Linden
eacd9d5d59
merge changes for storm-981
2011-02-16 15:52:05 -05:00
Jonathan Yap
eff712570d
STORM-990 Merged from current v-d trying to resolve merge issue Oz was having
2011-02-15 16:10:21 -05:00
Twisted Laws
e3f075f775
STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 meters
2011-02-15 14:13:43 -05:00
Tofu Buzzard
ef49d3f30b
merge
2011-02-14 11:31:24 -08:00
Loren Shih
547293305b
Automated merge up from viewer-development into mesh-development
2011-02-14 09:57:32 -05:00
Jonathan Yap
2bd790daaa
STORM-990 The arrow in the bottom right of the Landmark panel points down
2011-02-12 06:30:19 -05:00
Merov Linden
e15b543dd6
STORM-975 : pull into viewer-development
2011-02-11 17:42:37 -08:00
Oz Linden
4d040e3c5d
merge local changes
2011-02-11 14:06:27 -05:00
Jonathan Yap
355d6d1f79
STORM-980 Appearance panel / Wear button is too wide
2011-02-11 05:17:05 -05:00
Boroondas Gupte
29b3207fe4
OPEN-29 Error out if lldir_<platform>.h is included when building for a different platform
...
As far as I know, there is no good reason to include e.g.
indra/llvfs/lldir_win32.h while not building for a windows target, so be
better prevent this to avoid hard to find errors.
2011-02-11 01:27:01 +01:00
Jonathan Yap
06c1fede78
STORM-979 selection outline from inventory bottom panel buttons is cut at the left side when clicked.
2011-02-10 15:22:36 -05:00
Tofu Buzzard
c3d46cf609
merge
2011-02-10 09:54:55 -08:00
Loren Shih
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
Merov Linden
9aaf4b3ba7
STORM-981 : Fix Linux link issues when LL_TESTS is ON
2011-02-09 22:08:43 -08:00
Jonathan Yap
333a9b3f97
STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used
2011-02-09 10:52:12 -05:00
Merov Linden
47642e96f9
STORM-953 : pull into viewer-development
2011-02-08 22:23:32 -08:00
Merov Linden
6ba900073f
STORM-955 : pull into viewer-development
2011-02-08 22:22:25 -08:00
Merov Linden
2a13dc7930
STORM-960 : pull into viewer-development
2011-02-08 22:21:15 -08:00
Jonathan Yap
979cd0300f
STORM-975 forgot to update contributions.txt
2011-02-07 11:55:17 -05:00
Jonathan Yap
759eed5ef6
STORM-974 forgot to edit contributions.txt
2011-02-07 11:53:08 -05:00
Aleric Inglewood
ef490e308c
Introduces a LLThreadLocalData class that can be
...
accessed through the static LLThread::tldata().
Currently this object contains two (public) thread-local
objects: a LLAPRRootPool and a LLVolatileAPRPool.
The first is the general memory pool used by this thread
(and this thread alone), while the second is intended
for short lived memory allocations (needed for APR).
The advantages of not mixing those two is that the latter
is used most frequently, and as a result of it's nature
can be destroyed and reconstructed on a "regular" basis.
This patch adds LLAPRPool (completely replacing the old one),
which is a wrapper around apr_pool_t* and has complete
thread-safity checking.
Whenever an apr call requires memory for some resource,
a memory pool in the form of an LLAPRPool object can
be created with the same life-time as this resource;
assuring clean up of the memory no sooner, but also
not much later than the life-time of the resource
that needs the memory.
Many, many function calls and constructors had the
pool parameter simply removed (it is no longer the
concern of the developer, if you don't write code
that actually does an libapr call then you are no
longer bothered with memory pools at all).
However, I kept the notion of short-lived and
long-lived allocations alive (see my remark in
the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356
which requires that the LLAPRFile API needs
to allow the user to specify how long they
think a file will stay open. By choosing
'short_lived' as default for the constructor
that immediately opens a file, the number of
instances where this needs to be specified is
drastically reduced however (obviously, any
automatic LLAPRFile is short lived).
***
Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/
regarding (doxygen) comments. This patch effectively only changes comments.
Includes some 'merge' stuff that ended up in llvocache.cpp
(while starting as a bug fix, now only resulting in a cleanup).
***
Added comment 'The use of apr_pool_t is OK here'.
Added this comment on every line where apr_pool_t
is correctly being used.
This should make it easier to spot (future) errors
where someone started to use apr_pool_t; you can
just grep all sources for 'apr_pool_t' and immediately
see where it's being used while LLAPRPool should
have been used.
Note that merging this patch is very easy:
If there are no other uses of apr_pool_t in the code
(one grep) and it compiles, then it will work.
***
Second Merge (needed to remove 'delete mCreationMutex'
from LLImageDecodeThread::~LLImageDecodeThread).
***
Added back #include <apr_pools.h>.
Apparently that is needed on libapr version 1.2.8.,
the version used by Linden Lab, for calls to
apr_queue_*. This is a bug in libapr (we also
include <apr_queue.h>, that is fixed in (at least) 1.3.7.
Note that 1.2.8 is VERY old. Even 1.3.x is old.
***
License fixes (GPL -> LGPL). And typo in comments.
Addresses merov's comments on the review board.
***
Added Merov's compile fixes for windows.
2011-02-05 15:58:07 +01:00
Tofu Buzzard
84645f5b59
merge
2011-02-03 09:49:14 -08:00
Loren Shih
957b8b15e1
Automated merge up from viewer-development into mesh-development
2011-02-03 10:32:05 -05:00
Jonathan Yap
38b228ad18
STORM-953 Clarify what happens when you uncheck Allow Public Access
...
Note: This change also incorporates STORM-960
2011-02-02 18:41:11 -05:00
Jonathan Yap
df05f01fcd
STORM-960 Descriptive text missing next to first checkbox in About Land/Access
...
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02 18:36:42 -05:00
Merov Linden
dca34a56d2
STORM-435 : pull into viewer-development
2011-02-02 15:04:27 -08:00
Tofu Buzzard
ce90d8f8da
merge
2011-02-01 09:45:28 -08:00
Loren Shih
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
Oz Linden
cb6d59513e
merge changes for storm-829
2011-01-31 12:32:57 -05:00
Twisted Laws
0d5b0cad14
Embed Minimap into the Nearby list of the People Sidebar
2011-01-26 19:22:42 -05:00
Loren Shih
d0cba9e919
Automated merge up from viewer-development into mesh-development
2011-01-24 10:56:40 -05:00
Aleric Inglewood
295536ae98
VWR-24321: fix validation of textures that start with 00
2011-01-24 09:35:41 -05:00
Oz Linden
7a453b7c93
add missing entry in contributions.txt for VWR-24347
2011-01-21 16:20:29 -05:00
Aleric Inglewood
ee6a40beb1
VWR-24519: make debugging easier by not spawning spare process
2011-01-21 16:02:38 -05:00
Aleric Inglewood
97a9211d87
VWR-24354: correct manifest dependencies to prevent parallel install problem
2011-01-21 15:48:12 -05:00
Oz Linden
790dfe7556
merge changes for storm-844
2011-01-21 15:29:40 -05:00
Oz Linden
4652e26196
merge changes for storm-869
2011-01-21 15:14:39 -05:00
Loren Shih
38f4bad925
Automated merge up from viewer-development
2011-01-21 10:36:29 -05:00
Aleric Inglewood
c47ab36b20
VWR-24320: remove dump of call stack on clean exit
2011-01-20 16:01:27 -05:00
Aleric Inglewood
a873ae55a3
VWR-24317: remove warning due to unassigned variable
2011-01-20 15:57:07 -05:00
Aleric Inglewood
42604a1080
VWR-24315: update cached control values when resetting debug setting to default
2011-01-20 14:35:04 -05:00
Aleric Inglewood
80d7432ce6
VWR-13040 - clean up LLObjectSelection iterator
2011-01-20 14:26:57 -05:00
Jonathan Yap
3571e83b64
STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup
2011-01-19 06:02:08 -05:00
Boroondas Gupte
8a22154e5d
merged VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
2011-01-18 00:34:09 +01:00
Boroondas Gupte
eb9f19dabd
VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
...
CMake before 2.8.2 doesn't support QUIET for pkg_check_modules(), yet.
Credit goes to Aleric, 'cause he told me what to change.
2011-01-17 18:52:24 +01:00
Oz Linden
74fdba8295
merge changes for vwr-24420
2011-01-17 10:30:36 -05:00
Kitty Barnett
1d7b46e2c3
VWR-24217: allow Contents folder from object to be dragged to inventory
2011-01-17 10:09:52 -05:00
Jonathan Yap
6a3d06deca
STORM-844 Better way of doing "More" should be "Less" when Media Control is open
...
thanks to Twisted Laws
2011-01-16 12:10:44 -05:00
Tofu Buzzard
4f06f3dae6
FIX VWR-24509 Fix SSAO speckling artifacts at distance, re-enable distant SSAO
...
(transplanted from ef938dea0504b12fcf802f38fcf5457ba566c468)
2011-01-16 13:36:44 +00:00
Loren Shih
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
Merov Linden
c020c5c0f3
STORM-723 : pull in viewer-development
2011-01-12 12:01:44 -08:00
Merov Linden
40cd81f423
STORM-615 : pull in viewer-development
2011-01-12 11:18:19 -08:00
Jonathan Yap
e27ae655c6
STORM-844 Minor adjustment to contributions.txt
2011-01-12 10:37:15 -05:00
Jonathan Yap
3703f0bb0d
STORM-844 "More" should be "Less" when Media Control is open
2011-01-12 08:24:38 -05:00
Loren Shih
fdf19a5268
Automated merge up from viewer-development
2011-01-10 11:20:39 -05:00
Thickbrick Sleaford
fe28f89e7e
merge VWR-24420 into v-d
2011-01-09 18:29:56 +02:00
Thickbrick Sleaford
db1a63e99e
FIX VWR-24420 Keep alpha channel in PNG images with background color.
...
Remove code that composites RGBA PNG images that specify a background
color down to RGB.
2011-01-09 01:13:38 +02:00
Coaldust Numbers
8cfea0bab1
VWR-1095 fix for problems with uploads following bulk upload failure
...
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Jonathan Yap
c692b2bdb2
STORM-435 There is no space between name of object and value of object in Chat step while creating new gesture
2011-01-07 13:12:39 -05:00
Loren Shih
61e3c95dbf
Automated merge up from viewer-development
2011-01-07 10:14:33 -05:00
Oz Linden
894e98a708
merge changes for storm-812
2011-01-06 14:33:35 -05:00
Loren Shih
b30ff3fb9a
Automated merge up from viewer-development
2011-01-06 11:06:09 -05:00
Jonathan Yap
d0b5e6b0b4
STORM-829 Viewer 2 does not parse /me in object Instant Messages
2011-01-06 06:07:11 -05:00
Oz Linden
eb0b8ab3ea
merge changes for storm-825
2011-01-05 17:53:37 -05:00
Loren Shih
7c7527b672
Automated merge up from viewer-development
2011-01-05 15:10:39 -05:00
Oz Linden
78895f9e0c
merge changes for storm-467
2011-01-04 16:45:08 -05:00
Oz Linden
05810f063d
merge changes for storm-737
2011-01-04 16:43:26 -05:00
Oz Linden
e4591a8518
merge changes for storm-466
2011-01-04 16:41:05 -05:00
Aleric Inglewood
9531046609
STORM-955: VWR-24312: Massively duplicated objects
...
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.
After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
Loren Shih
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
Wolfpup Lowenhar
44e6327674
STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp
...
Removed the skipping of a working test as this was causeing a the test to fail
building and thus not actualy running all the tests.
2010-12-28 19:14:33 -05:00
Jonathan Yap
d420ca89b4
STORM-466 Put Twisted Laws name into contributions.txt
2010-12-28 05:32:43 -05:00
Merov Linden
0b74df6774
STORM-523 : pull into viewer-development
2010-12-27 21:21:01 -08:00
Oz Linden
14d830ca43
merge improved fix for STORM_785
2010-12-24 07:41:41 -05:00
Jonathan Yap
1ca028cd7b
STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects
2010-12-23 17:12:37 -05:00
Loren Shih
c87142e5d7
Automated merge up from viewer-development
2010-12-20 12:44:56 -05:00
Jonathan Yap
09c7d38166
STORM-467 Fix for minimap zoom does not persist to the next session
2010-12-18 16:44:51 -05:00
Nyx (Neal Orman)
fa17e848a6
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-17 16:19:15 -05:00
Nyx (Neal Orman)
089f9d6d37
merging in fix for CTS-323 / SH-464
2010-12-17 16:06:32 -05:00
Kitty Barnett
452d9d5e3d
Updated contributions.txt for STORM-799 and STORM-800
2010-12-17 15:15:10 +01:00
Jonathan Yap
551bfb88fc
Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate)
2010-12-17 07:29:27 -05:00
Loren Shih
ee0055f5af
Automated merge up from viewer-development
2010-12-16 11:12:15 -05:00
Aleric Inglewood
a902160723
VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a non-standard directory.
...
If tut/tut.hpp isn't installed in a standard include directory all tests
fail because the found include directory for tut isn't passed to the compiler.
This patch fixes this by passing it.
Note that using include_directories() in a Find*.cmake file is bad practise.
The correct way is to set an include dir variable and call
include_directories() once. It certainly doesn't work for the tests anyway
because the tests are all over the place and include_directories is on a
per folder basis. What is needed is to set it for each (test) target.
However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we
have is to set the COMPILE_FLAGS property for a target.
Fortunately, standalone is only used for linux, so we can just use
-I${TUT_INCLUDE_DIR} to get the effect we want.
2010-12-16 15:43:18 +01:00
Aleric Inglewood
85446c8cf1
VWR-10579: Fix NDOF.cmake to do the right thing on standalone.
...
The old one just assumed that libndof is installed,
even on standalone.
This patch looks for it on standalone, unless configured
with -DNDOF:BOOL=OFF, and when not found prints an error
message (including telling about -DNDOF:BOOL=OFF).
2010-12-15 22:44:21 +01:00
Aleric Inglewood
5936ced311
SNOW-240: Fix libjson naming madness, again, for standalone.
...
SNOW-240 was actually about adding the whole search.
While this has been done, there is one issue left:
On linux (and remember, all of this is about standalone)
the libjson packages of distributions don't have this
complex compiler version baked into their name.
See also the last comment on SNOW-240:
https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305
This patch fixes this issue by first searching for
libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so
and when that fails search for the system package
library file libjson.so.
2010-12-15 21:23:03 +01:00
Aleric Inglewood
86380bb177
VWR-24254: Add support for using ld.gold on linux.
...
To use ld.gold configure with:
-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold".
ld.gold links the viewer on my machine in 8 seconds, as
opposed to 19 seconds with ld.bfd. Moreover, it uses a
LOT less memory during linking (about 750 MB instead of
2.5 GB!).
VWR-24254: Don't link with fontconfig on non-linux.
While we already added fontconfig in the above patch,
that code turned out to also be used by Windows and
Darwin (contrary to the comments in the code).
After looking at the history of commits and a
discussion on IRC it was decided that the original
coder (Kyle Ambroff <ambroff@lindenlab.com>) really
meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-12-15 20:55:10 +01:00
Aleric Inglewood
3f5d67bcb7
VWR-24261: Configuration with cmake 2.8 is extremely slow
...
Add non-broken FindZLIB.cmake.
2010-12-20 16:10:07 +01:00
Aleric Inglewood
d0a25a4184
VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.
...
If Qt and/or llqtwebkit is found in a non-standard place, you still
have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running
the viewer of course (or the webkit plugin will silently fail).
2010-12-15 20:12:17 +01:00
Aleric Inglewood
0de05499ed
VWR-24247: develop.py configure still searches for the wrong header file when checking for Tut
...
The viewer code includes "tut/tut.hpp" everywhere, so that is what we
should search for when determining an include path for this header.
This just searches in the usual places, including the paths provided
through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what
we need.
2010-12-15 17:40:22 +01:00
Aleric Inglewood
429e0caf17
SNOW-744: scripts/install.py --uninstall does not remove symbolic links.
...
This fixes the problem that when some package contains symbolic
links, they were never removed anymore (after an uninstall of
that package).
2010-12-15 17:31:18 +01:00
Wolfpup Lowenhar
bd53ba004a
STORM-776 : unable to change permissions to "no trans" on item in avatar inventory
...
applied Kitty's code changes listed in STROM-288 as it is a related issue and this
actualy fixed both issues!
2010-12-15 09:53:24 -05:00
Tofu Buzzard
a6e8026de0
CTS-411 edge ghosting in deferred rendering (w/shadows and shadow smoothing enabled)
...
(transplanted from c698ce37c0502597aafc75fcf9c37ff2970b7faf)
(transplanted from ae92e806703a0c03ec2ab76d74906c7465285aaf)
2010-12-15 13:40:28 +00:00
Andrew Productengine
d3eccbcd8b
STORM-229 FIXED Fixed long loading times and stalling of Viewer while loading big scripts or pasting a lot of text into script.
...
The bug was fixed by Satomi Ahn. Here is the description of what causes the problem from her comment in ticket:
"Disabling the loading of syntax keywords in LLScriptEdCore::postBuild() removes the freeze (and with it: syntax highlighting).
So it obviously comes from the parsing of the text.
I also noticed something else: by adding a llwarn in LLTextEditor::updateSegments(), I saw that this function was called a lot of times when loading a script, roughly once for each line in the script (naively I would have thought only necessary to update when finished... or to only update the new line).
My llwarn was in the "if (mReflowIndex < S32_MAX && mKeywords.isLoaded())", which means that, at each call, the text is actually parsed for all keywords... so the parsing of the script becomes quadratic instead of linear!!!"
- To fix this, Satomi added a flag depending on which parsing is disabled when it is not necessary.
2010-12-13 13:17:48 +02:00
Loren Shih
6a59861bde
Automated merge up from viewer-development
2010-12-07 14:56:36 -05:00
Jonathan Yap
066dfaee28
Add + control to Inventory/Recent tab
2010-12-07 10:14:07 -05:00
Merov Linden
8afbb58d4c
Pull viewer-beta in
2010-12-06 16:56:25 -08:00
Loren Shih
963e3346b1
Automated merge up from viewer-development
2010-12-03 10:41:46 -05:00
Jonathan Yap
71a1fd09e3
Add ability to see Details button in Object Profile for 1-prim objects
2010-12-03 10:15:33 -05:00
Jonathan Yap
50b6114862
Tiny change to panel_login.xml so Start Location preferences work under all circumstances
2010-12-03 07:30:19 -05:00
Jonathan Yap
106134b695
Fix for OK notification being overlaid by Keep/Discard/Block notification
2010-12-03 03:37:37 -05:00
Oz Linden
375d91019e
merge fix for STORM-679
2010-12-02 14:08:23 -05:00
Oz Linden
20e192029c
merge fix for STORM-596
2010-12-02 14:02:46 -05:00
Jonathan Yap
31f738583e
Forgot to give myself credit
2010-12-01 13:35:30 -05:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Jonathan Yap
732b1f748e
Forgot to give myself credit.
2010-11-25 13:45:05 -05:00
Boroondas Gupte
8edd7e94b1
merged CTS-323: Don't cast pointers to U32
2010-11-23 01:52:11 +01:00
Nyx (Neal Orman)
be1fd73390
CTS-320 SH-465 FIX use system zlib for standalone builds
...
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
Wolfpup Lowenhar
abf406e3d5
STORM-674: corrected duplicate name tags in pannel_preferences_color.xml
2010-11-23 20:55:18 -05:00
Jonathan Yap
fbfe7418e5
Moved Enable Hints to 2nd line of Help menu
2010-11-20 07:25:09 -05:00
Oz Linden
0f72f152e8
merge fix for STORM-616
2010-11-19 15:52:52 -05:00
Wolfpup Lowenhar
3eb3198248
STORM-654 : Person to Person chat logs are not created if Display Names are off
...
Modified code in indicated changeset to correct problem after consulting with
Leyla Linden who sugested the orginal change. This fix will convert the Legacy
name to a user name id not useing Display Names.
2010-11-18 18:30:00 -05:00
Jonathan Yap
7e5e9b26d5
Forgot to give myself credit.
2010-11-18 14:09:00 -05:00
Wolfpup Lowenhar
10998b137e
STORM-535 : STORM-544 : Addition of Floater Opacity controls to pannel_prefferences_color.xml
...
after loss during cleanup of preferences.
2010-11-16 13:33:56 -05:00
Vadim ProductEngine
e8e1d7e629
STORM-318 FIXED The Advanced menu shortcut was broken under Linux.
...
Reason: The old shortcut (Ctrl+Alt+D) was eaten by some window managers.
Changes:
- Changed the shortcut to Ctrl+Alt+Shift+D.
- Moved the appropriate menu item from "Advanced > Shortcuts" to "World > Show"
(so that it's not in the menu it triggers) and made it visible.
The old shortcut is still available but marked as legacy.
Submitting on behalf of Boroondas Gupte.
2010-11-15 21:38:12 +02:00
Wolfpup Lowenhar
899f470dec
STORM-102: Merge from viewer-development
2010-11-11 22:37:51 -05:00
Seth ProductEngine
54bf5d9de7
Added Tofu Buzzard to the contributors list.
2010-11-09 23:01:49 +02:00
Oz Linden
eea9460ba5
merge storm-102 branch back to default
2010-11-09 15:18:51 -05:00
Wolfpup Lowenhar
669cf170ce
STORM-102: STORM-143: Refactored the STORM-103 code to pull the proper plain test log no
...
matter when it was generated or if it has the date stamp in the name of the log or not.
--HG--
branch : storm-102
2010-11-08 09:31:35 -05:00
Oz Linden
e2714252f3
pull fix for STORM-422
2010-11-03 14:53:29 -04:00
Oz Linden
96112dfa26
STORM-477: fixed getNextFileInDir on Windows7, improved test cases and documentation
...
--HG--
branch : storm-102
2010-11-03 13:33:29 -04:00
Merov Linden
e9640296d3
STORM-420 : merge to viewer-development
2010-11-02 17:27:39 -07:00
Vadim ProductEngine
5d7417b40e
STORM-422 FIXED Added command line option "-disablecrashlogger" to disable crash logger.
...
This is a patch originally written by Robin Cornelius.
I made it work with Google Breakpad.
2010-11-02 20:26:38 +02:00
Wolfpup Lowenhar
a4bb2b8bdd
STORM-255 : Merge from viewer-development
2010-10-31 08:08:41 -04:00
Merov Linden
398b8564e1
STORM-420 : allow teleport when double clicking the minimap if doubleclick teleport is on, allow beacon setting if not
2010-10-29 15:42:29 -07:00
Vadim ProductEngine
463969116f
STORM-501 FIXED Script-editor shows ERRORS in the wrong line.
...
LLTextBase::setCursor() sometimes failed to work properly if line wrapping was enabled.
This is a slightly optimized version of the patch made by Satomi Ahn.
2010-10-29 23:48:46 +03:00
Wolfpup Lowenhar
dafece369a
STORM-255 : Added missing JIRA issue to contributions.txt
2010-10-29 09:16:51 -04:00
Wolfpup Lowenhar
46940d4a5f
STORM-255: removal if extra jira numbers in contributions.txt
2010-10-27 22:27:59 -04:00
Wolfpup Lowenhar
ce34ba1b89
Merge from viewer-development
2010-10-27 09:04:27 -04:00
Wolfpup Lowenhar
7c89e565b3
This is the setting of the core file name date stamp code and settings files for
...
Chat, Group and IM Logs.
--HG--
branch : storm-102
2010-10-26 20:02:07 -04:00