9bdf262d85
Merge
2010-03-15 18:31:45 -07:00
73ebb9efc9
ES linguistic; PT adding 4 missing strings from set4
2010-03-15 11:41:41 -07:00
00f2785682
EXT-6010 apperance reverts to an old outfit while attempting to wear new outfit
...
Removing log spam before pushing to main branch. change is de minimis. -Nyx
2010-03-15 14:11:25 -04:00
8fa640cfe2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-15 12:09:09 -04:00
8112ba5baf
EXT-6010 Appearance reverts to an old outfit while attempting to wear new outfit
...
Added code to suppress local composite updates while wearables are loaded. This
makes sure that we don't update your appearance until all your wearables are
added to gAgentWearables. Hackish for 2.0, but will be inherently better for 2.1
code reviewed by vir.
2010-03-15 12:08:57 -04:00
42d1aaee2e
PE merge.
2010-03-15 15:23:28 +00:00
8a8e8e46ee
merge
...
--HG--
branch : product-engine
2010-03-15 13:35:20 +02:00
ea6af38e40
Fixed normal bug (EXT-5834) Inventory SP: context menu for empty search result contain inappropriate items.
...
- Fixed folder_view and inventory_panel resizing in LLFolderView::arrange() when all visible items are filtered out. This fixed context menu for "Search" SLURL in Places->My Landmarks.
- Added check for visible items to display correct context menu when right-clicking on "Search" SLURL for empty search results in any inventory panel.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/14/
--HG--
branch : product-engine
2010-03-15 12:51:57 +02:00
bc1f01c948
fix for EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs translation
...
--HG--
branch : product-engine
2010-03-15 12:04:30 +02:00
641757e7c1
Fixed normal task EXT-6018 - [TRANSLATED BUT IN EN] "Save" button on notecard
...
Removed deprecated string to resolve duplicated names(string.save and button.save).
Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/12/
--HG--
branch : product-engine
2010-03-15 10:35:09 +02:00
a58551c050
Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit Pick - "(will update after save)"
...
Replaced hardcoded string with xml string.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/8/
--HG--
branch : product-engine
2010-03-15 10:32:51 +02:00
272772b867
Fixed normal task EXT-6260 - [NAMELESS STRING] - Menu Preferences, Tab Chat: Show IMs in: and (requires restart) need to be localized (panel_preferences_chat.xml)
...
Added widget missing names to make localization tool work.
Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/7/
--HG--
branch : product-engine
2010-03-15 10:30:54 +02:00
234cd6e7c0
Fix-up of doc/contributions.txt (missed another one!), no functional changes
2010-03-13 20:04:54 +00:00
d44485b106
Fix-up of doc/contributions.txt, no functional changes
2010-03-13 19:48:22 +00:00
da62a52b8d
ES missing strings from set4-6; linguistic
2010-03-12 16:58:12 -08:00
8c33d5aecc
Merge
2010-03-12 16:12:34 -08:00
69efa833f7
linguistic
2010-03-12 16:11:29 -08:00
c1fc387b58
EXT-2180 final linguistic edits of set1 and set6b by Novella
2010-03-12 16:08:46 -08:00
d5e685306c
(for B5) Fix for EXT-5823 "Include language in user-agent string" (implemented via JavaScript - not in ua string)
...
(for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry"
Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
2010-03-12 14:34:25 -08:00
6079a50186
New linux build of llqtwebkit.
...
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-12 13:49:40 -08:00
bf767cc648
New mac build of llqtwebkit.
...
Built from revision da5938d041a1 of hg.lindenlab.com/monroe/llqtwebkit-4.6/
and commit 976cb208e4c1ae9df62bce979a5148d7b89172c5 of http://gitorious.org/+lindenqt/qt/lindenqt
2010-03-12 13:46:35 -08:00
a212f0cb3a
EXT-5983 manual fix for changed EN root element name= (VLT bug; didn't flag change before)
2010-03-12 13:44:16 -08:00
7fb20a0b88
undid change for VLT test
2010-03-12 13:40:23 -08:00
114a0db23f
temp test VLT functionality on root element name change
2010-03-12 13:33:27 -08:00
5c6630c394
EXT-5988
2010-03-12 13:14:18 -08:00
3824a94628
Merge
2010-03-12 11:12:09 -08:00
e712889cc2
linguistic
2010-03-12 11:10:58 -08:00
8f54888071
Fix for EXT-6336 Minor memory leak in LLFontRegistry::createFont
...
Reviewed by: Tofu
2010-03-12 11:59:43 +00:00
1aba72c75b
PE merge
2010-03-12 10:27:20 +00:00
4dc63de6a8
completed EXT-6305 (Remove "ScriptToast" notification in xui/en and all localizations)
...
just cleaned up notifications.xml
reviewed by Richard and Tofu at https://codereview.productengine.com/secondlife/r/1/
--HG--
branch : product-engine
2010-03-12 12:13:33 +02:00
61e6c888f0
fixed EXT-3607 (Cancelling a Land Sale to Specific Person Allows Land to be Set For Sale to Anyone Briefly)
...
added additional check so that "for sale to anyone" text is shown only when a parcel is on sale
reviewed by Richard at https://codereview.productengine.com/secondlife/r/4/
--HG--
branch : product-engine
2010-03-12 12:09:22 +02:00
a158cdb133
Merge
2010-03-11 15:24:31 -08:00
26df477d51
VWR-18254 en_xui_change
2010-03-11 15:18:02 -08:00
b3a8f8d714
merge
2010-03-11 17:50:41 -05:00
779844f73a
For EXT-5333: Bodyparts missing from appearance and COF. Recovered wearables were failing to get added correctly due to wrong timeout logic. Reviewed by Nyx.
2010-03-11 17:50:14 -05:00
4588965cf6
linguistic changes
2010-03-11 14:20:42 -08:00
9c848251a1
VWR-18253 en_xui_change
2010-03-11 14:18:35 -08:00
0b6760e411
Merge
2010-03-11 10:52:36 -08:00
2e387e303f
linguistic change
2010-03-11 10:51:17 -08:00
a618a3913a
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2010-03-11 14:07:03 +08:00
e48f56fefc
merge from repo
2010-03-11 10:21:50 +08:00
575fff1e4d
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2010-03-11 10:18:46 +08:00
dc44d2dc1a
a try to fix EXT-5845: crash on LLTexLayerTemplate::render [secondlife-bin lltexlayer.cpp:1898]
2010-03-10 18:24:02 -07:00
ebc63494b3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-10 17:37:00 -07:00
fdfc59da9b
debug code for EXT-6093: crash at LLTextureCache::updateTextureEntryList [secondlife-bin lltexturecache.cpp:847]
2010-03-10 17:34:49 -07:00
5b7f8c719b
debug code for EXT-5599: Viewer crashes consistently, in Linden Homes region.
2010-03-10 17:33:43 -07:00
942eb09073
VWR-18046 en_xui_change
2010-03-10 11:58:04 -08:00
ecc02f3420
Merge
2010-03-10 10:55:33 -08:00
e349c33fa9
linguistic change
2010-03-10 10:53:17 -08:00
bc852b9a5d
PE merge
2010-03-10 10:30:56 +00:00
Eli Linden