Alexei Arabadji
1a7166dd40
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-16 16:52:28 +02:00
Alexei Arabadji
a77bf7a1c2
fixed EXT-2365 "LLAlertHandler should can process notifications before login.";
...
initialized notifications screen channels after LLViewerWindow instantiated
and disabled all old notifications widgets(LLNotifyBox, LLGroupNotifyBox,
LLAlertDialog);
--HG--
branch : product-engine
2009-11-16 16:51:06 +02:00
Vadim Savchuk
8971d6bd7e
merge
...
--HG--
branch : product-engine
2009-11-16 16:28:45 +02:00
Vadim Savchuk
eef22e0baf
Merge from default branch
...
--HG--
branch : product-engine
2009-11-16 16:28:04 +02:00
Denis Serdjuk
beb62fa222
Fix for bug EXT-1234. Crash after click on For Sale banner for remote place
...
Cause:
After teleporting LLViewerParcelMgr resets current selected parcel.
Changes:
Complementary check of selected parcel has been added.
--HG--
branch : product-engine
2009-11-16 15:37:30 +02:00
Alexei Arabadji
59d575fe61
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-16 14:36:46 +02:00
Alexei Arabadji
89e917599b
fixed EXT-862 "Add support for Busy mode into notifications";
...
disabled showing toasts except alertmodal in busy mode
--HG--
branch : product-engine
2009-11-16 14:36:09 +02:00
Dmitry Oleshko
154f501cb1
fixed normal bug (EXT-2503) Clicking on (x) button in Message Well Window doesn't dismiss a group notice
...
Added to the handler of group notices functionality on rejecting of notifications.
This behavior was broken earlier in the handler for script notifications.
--HG--
branch : product-engine
2009-11-16 14:34:38 +02:00
Yuri Chebotarev
eeaeca81b9
fix for normal ticket EXT-2459 Nearby toasts aren't visible when nearby chat console is minimized
...
--HG--
branch : product-engine
2009-11-16 14:13:36 +02:00
Alexei Arabadji
508097d0f6
fixed EXT-2500 "Avatar stops moving when online/offline notification toast
...
popups"
--HG--
branch : product-engine
2009-11-16 14:11:50 +02:00
Eugene Mutavchi
e62d7410ee
Fixed normal bug EXT-2376 (Friends List folder not being correctly identified/fetched)
...
--HG--
branch : product-engine
2009-11-16 13:24:50 +02:00
Mike Antipov
75fe049b18
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
...
- code cleaned up, removed commented out & unused code
Functionality was not changed
--HG--
branch : product-engine
2009-11-16 13:18:42 +02:00
Andrew Dyukov
602921ba2d
Fixed normal bug EXT-2452 (Favorites Bar tooltip shows only 2 out of 3 coordinates).
...
--HG--
branch : product-engine
2009-11-16 13:15:09 +02:00
Alexei Arabadji
e7519e8a97
fixed EXT-2402 "Clicking on notification item in the Message Well should bring
...
it to front"
made LLToast and LLDockableFloater goes foreground on setVisible(TRUE);
--HG--
branch : product-engine
2009-11-16 11:41:21 +02:00
Steve Bennetts
bd42c1ae2c
merge
2009-11-15 22:42:16 -08:00
Steve Bennetts
651541a899
Fixed a deadlock causing textrue caching to stall.
2009-11-15 22:39:48 -08:00
Eric M. Tulla (BigPapi)
c6f1c8e704
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-15 23:23:10 -05:00
Eric M. Tulla (BigPapi)
d029874531
EXT-2203 & EXT-2302 - Look->Outfit rename and wear button enabling not properly hooked up
2009-11-15 23:21:28 -05:00
CG Linden
6b47e36b15
Add some debug output to develop.py
2009-11-15 11:39:00 -08:00
CG Linden
853faf5316
Invoke native python for develop.py, not CYGWIN python, revert develop.py's original usage
2009-11-15 09:41:07 -08:00
CG Linden
da4f76c17a
Set PATH to devenv.com to avoid problem with develop.py's use of os.system()
2009-11-15 09:22:00 -08:00
Steve Bennetts
f17399212e
Compile fix for Windows
2009-11-14 11:09:07 -08:00
Steve Bennetts
1e1b8d036f
merge
2009-11-14 10:26:34 -08:00
Steve Bennetts
0d25816280
merge
2009-11-14 10:25:14 -08:00
Steve Bennetts
ed06c4b8b9
merge from product-engine
2009-11-14 10:25:02 -08:00
Steve Bennetts
637b6673bc
More texture cache fixes, including a possible deadlock when the cache was getting purged.
...
Significantly reduced spurrious warnings and delition of non sin-based texture fetch comptabable sided cache files.
2009-11-14 10:22:32 -08:00
Sergei Litovchuk
93c1e1bd6e
No ticket.
...
- Fixed toggleable menu in Picks panel.
- Minor optimization of LLToggleableMenu.
--HG--
branch : product-engine
2009-11-14 19:15:51 +02:00
Sergei Litovchuk
9e11d70225
Fixed major bug EXT-2316 "Insert the option "pay" in the profile":
...
- Added menu item according to Communications design spec in section 4.1.2.1.
--HG--
branch : product-engine
2009-11-14 18:12:18 +02:00
Steve Bennetts
f67a8ad12e
Mutex lock fix for texture cache.
...
Also a fix for texture purging when reducing the cache size.
2009-11-13 22:54:55 -08:00
Eric M. Tulla (BigPapi)
a39bda1b77
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 22:23:14 -05:00
Eric M. Tulla (BigPapi)
68c6ff791f
Fix for post-merge compile error.
2009-11-13 22:22:30 -05:00
Monroe Linden
a58dd26b20
Tweaks to media priority calculation.
...
Enabled CPU limit setting by default (set to 100% of 1 CPU).
Lowered default limits on plugin priorities: 2 normal+, 4 low, 8 total.
Limit on total number of instances now only applies to inworld media -- media instances in the UI (such as the help browser and search) don't count toward the limit. UI media will still bump inworld media down from normal/low priority, though.
Several improvements to plugin manager debug code in the nearby media list.
Don't load unloaded instances that are at PRIORITY_SLIDESHOW or PRIORITY_HIDDEN (they don't get unloaded, they just won't be loaded unless they're at higher priority).
Added LLViewerMediaImpl::isPlayable(), which indicates whether an instance would be loaded if it were high enough in the priority list (taking into account autoplay and current load state). Priority algorithm now takes this into account.
Fixed a couple of issues with approximate texture interest calculation and its use in setting priorities.
Adjusted sleep times on low and normal priorities to be more friendly.
2009-11-13 18:15:35 -08:00
Rick Pasetto
6752853423
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 17:42:51 -08:00
Rick Pasetto
6be35d363f
Integrated most of the final artwork into the media controls
2009-11-13 17:42:38 -08:00
Eric M. Tulla (BigPapi)
cd9c5e5d70
merging avatar-pipeline branch into viewer-2-0
2009-11-13 20:34:55 -05:00
Eric M. Tulla (BigPapi)
6f52f1e502
Post merge compile fixes
...
--HG--
branch : avatar-pipeline
2009-11-13 20:18:44 -05:00
Eric M. Tulla (BigPapi)
99dcd4f493
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 19:27:48 -05:00
Eric M. Tulla (BigPapi)
3194c89177
Merging viewer2 changes into avp branch
...
--HG--
branch : avatar-pipeline
2009-11-13 19:26:20 -05:00
Leyla Farazha
c5732c824f
merge
2009-11-13 16:17:46 -08:00
Leyla Farazha
c8ed7710c5
Backed out changeset db8e08f8ba36
...
adding main_view.xml change rev 4863 back
2009-11-13 15:57:38 -08:00
Leyla Farazha
3abee9a450
Fix for nearby chat toasts occluding the bottom bar.
2009-11-13 15:56:46 -08:00
Nyx (Neal Orman)
4bb5cd169b
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-13 18:20:01 -05:00
Nyx (Neal Orman)
be429a3ae9
EXT-2429 body parts out of sync with COF
...
Visual param definitions weren't working properly when the wearable being
loaded had fewer visual parameters than the current definition of the wearable.
This occurred when you were loading wearables that had been created in older
versions of the client (or from the library).
Added missing parameters to mSavedVisualParamMap, and modified revertValues()
to ensure that the two maps are kept fully in sync on finishing loading the
wearable and when reverting the values.
Code reviewed by Vir
--HG--
branch : avatar-pipeline
2009-11-13 18:19:22 -05:00
Rick Pasetto
4ca8b32bce
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 15:11:10 -08:00
Rick Pasetto
a4addf39e5
Small mods based on code review feedback from James
2009-11-13 15:09:59 -08:00
Monroe Linden
6cb4b27897
Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing object properties).
...
Made LLPanelMediaSettingsGeneral::updateMediaPreview() only do a navigate when the URL actually changes.
2009-11-13 14:48:24 -08:00
Loren Shih
0ce8ce50d8
merge
...
--HG--
branch : avatar-pipeline
2009-11-13 17:48:11 -05:00
Loren Shih
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
Erica
21357c4822
fixing media texture image names - removing file extention
2009-11-13 14:28:58 -08:00
Loren Shih
3027c9fcce
Header file #include cleanup for llinventorymodel and llinventorypanel.
...
Removed a bunch of unnecessary header inclues.
--HG--
branch : avatar-pipeline
2009-11-13 16:58:08 -05:00