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
280ad0e38e
linguistic changes
2010-03-11 14:20:42 -08:00
4588965cf6
linguistic changes
2010-03-11 14:20:42 -08:00
c5b0a94808
VWR-18253 en_xui_change
2010-03-11 14:18:35 -08:00
9c848251a1
VWR-18253 en_xui_change
2010-03-11 14:18:35 -08:00
f5c431aa7b
EXT-6276 Put in some gl flush calls to texture state functions.
2010-03-11 16:06:36 -06:00
9aefe34998
EXT-6276 Put in some gl flush calls to register combiner functions (why these are being used for UI now is beyond me)
2010-03-11 15:19:27 -06:00
0b6760e411
Merge
2010-03-11 10:52:36 -08:00
1380c9632a
linguistic change
2010-03-11 10:51:17 -08:00
2e387e303f
linguistic change
2010-03-11 10:51:17 -08:00
88386000af
Merge some stuff I'd been saving for viewer 2.1.
2010-03-11 17:42:45 +00:00
e7027a57e1
fixed EXT-5904 “Offers embedding into IM windows”,
...
revised embedding and logging offer notification to provide loading log entry
in case notification doesn't exist;
--HG--
branch : product-engine
2010-03-11 17:53:49 +02:00
4a46fb0f86
merge from viewer-2-0
2010-03-11 11:29:32 +00:00
3298ab474e
fix line ending in file llfloater.cpp
2010-03-11 17:35:46 +08:00
1b1dd127a4
merge.
2010-03-11 09:19:20 +00:00
6d738f25d9
The 'strict' fix for EXT-6288. Stricter than the lower-risk fix which is intended for viewer 2.0.
2010-03-11 08:38:35 +00:00
fe8304ff49
merge
2010-03-11 14:10:37 +08:00
a618a3913a
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2010-03-11 14:07:03 +08:00
27db10b526
merge
2010-03-10 18:29:25 -08:00
dcbf0ab31b
merge
2010-03-10 18:22:26 -08:00
e48f56fefc
merge from repo
2010-03-11 10:21:50 +08:00
1e5fe95b1d
EXT-6295 - Cannot log in with new account, TOS dialog does not load
...
reviewed by Mani
2010-03-10 18:20:18 -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
347585cf97
Fix for EXT-6276.
...
Added a check in LLTextBase::drawSelectionBackground() to keep it from sending degenerate rectangles to gl_rect_2d(). This seems to be what was causing the GL state to go bad.
Reviewed by Richard at http://codereview.lindenlab.com/534001
2010-03-10 14:32:40 -08:00
51010803df
First draft of changes for avatar outfit panel, so PE can start working on it.
...
Demo code, will get cleaned up / extended through future work on the project - just need to check it in to collaborate.
2010-03-10 16:38:00 -05:00
2e525711cd
Clean up login page a bit
2010-03-10 12:41:55 -08:00
4e5a7d6912
VWR-18046 en_xui_change
2010-03-10 11:58:04 -08: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
d88b158315
linguistic change
2010-03-10 10:53:17 -08:00
e349c33fa9
linguistic change
2010-03-10 10:53:17 -08:00
51ae05baa8
Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
...
--HG--
branch : product-engine
2010-03-10 20:06:22 +02:00
ccbbfeb0a0
fixed EXT-5904 “Offers embedding into IM windows”,
...
shortened timestamp of embedded offers;
unified sender name of session message entry and file log entry for system messages;
--HG--
branch : product-engine
2010-03-10 20:03:28 +02:00
3ab788b14f
Implemented normal sub-task EXT-5909(Accepted/declined inventory offer shouldn't spawn chiclet).
...
- Removed check for INVENTORY_DECLINED from LLHandlerUtil::canSpawnIMSession().
- Added new method LLHandlerUtil::canSpawnToast() and check with it to LLTipHandler::processNotification() to supress toasts when respective IM window is open.
--HG--
branch : product-engine
2010-03-10 19:50:24 +02:00
b2f6cab24f
fixed EXT-5910 “Offers logging”,
...
replaced interactive system message marker with correct from string value when
message logged without adding to the session;
--HG--
branch : product-engine
2010-03-10 19:24:56 +02:00
3e75fe4db1
Merge from default branch
...
--HG--
branch : product-engine
2010-03-10 16:02:39 +02:00
9757cd64e1
fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated opened by 'Start IM' button
...
added timing out of session initialization (after 30 seconds)
--HG--
branch : product-engine
2010-03-10 14:04:36 +02:00
e65f945243
merge from viewer-2-0
2010-03-10 11:33:43 +00:00
bc852b9a5d
PE merge
2010-03-10 10:30:56 +00:00
f99a86753e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-10 09:29:45 +00:00
983d633a3c
EXT-6114: Ignore secondlife:///app/login SLapps if logged in.
...
If you were already logged in, clicking on these SLapps would crash
your viewer (crash was in experimental reg-in-client code). We now
ignore these SLapps if the user is already logged in, and a one-time
warning is emitted in this case.
2010-03-10 09:27:49 +00:00
d6b32cd0a8
Update for major bug EXT-5942 - Entering a Classified with a banned keyword doesn't publish, and doesn't let you edit.
...
Updated code for disabling verbs for unpublished classified.
--HG--
branch : product-engine
2010-03-10 11:24:22 +02:00
2197304984
Fixed major bug EXT-5942 - Entering a Classified with a banned keyword doesn't publish, and doesn't let you edit.
...
Changed the way panels handle classified publishing - each classified panel will keep listening to callbacks and will know when classified is published successfuly.
If publish failed, panel will allow user to edit classified and try publishing again.
All unpublished classifieds will be lost on Viewer restart.
--HG--
branch : product-engine
2010-03-10 10:21:19 +02:00
f6754b9fd0
improved mouse cursors (32-bit)
2010-03-09 19:12:43 -08:00
50abb9b972
Merge
2010-03-09 18:30:59 -08:00
Brad Payne (Vir Linden)