Yuri Chebotarev
026a35798f
merge
...
--HG--
branch : product-engine
2009-11-13 13:50:43 +02:00
Yuri Chebotarev
0c7a4b6a7d
EXT-2342 Script : Fails to work in Alpha 6
...
ok toast for objects are back...
also add object inspector to nearby chat object context menu
--HG--
branch : product-engine
2009-11-13 13:49:14 +02:00
Vadim Savchuk
78a16b9334
merge
2009-11-13 13:31:46 +02:00
Vadim Savchuk
3cc8a37489
merge
2009-11-13 13:31:16 +02:00
Eugene Kondrashev
9e11895c25
No ticket. Fixed crash caused by wierdly coded std::map by MS
...
--HG--
branch : product-engine
2009-11-13 13:10:30 +02:00
Eugene Kondrashev
b256d57b0d
No ticket. Fix to prevent crash.
...
--HG--
branch : product-engine
2009-11-13 12:59:19 +02:00
Yuri Chebotarev
a569421eca
merge
...
--HG--
branch : product-engine
2009-11-13 12:59:04 +02:00
Yuri Chebotarev
bed508f9ef
EXT-2339 Chat : Nearby chat does not show full text - increase max_length to 512
...
--HG--
branch : product-engine
2009-11-13 12:58:05 +02:00
Andrew Polunin
eb1484a0c9
implemented normal task EXT-2175 Set up functionality for \"Leave Selected Group\" option
...
--HG--
branch : product-engine
2009-11-13 12:37:52 +02:00
Eugene Kondrashev
05d2f3f764
No ticket. A little refactoring.
...
--HG--
branch : product-engine
2009-11-13 12:32:06 +02:00
Eugene Kondrashev
d116185bfd
Fixed Low bug EXT-2404-Nearby Chat: There is redundant semicolon in the log for system messages
...
--HG--
branch : product-engine
2009-11-13 12:26:57 +02:00
Igor Borovkov
1db5d35447
merge
...
--HG--
branch : product-engine
2009-11-13 12:06:52 +02:00
angela
a7b8b51a5a
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 15:20:04 +08:00
angela
01f1eaf7e0
fix style readonlycolor overwriting color
2009-11-13 15:19:37 +08:00
James Cook
20c0a0b68f
Test intentionally not-found LLUICtrl.
2009-11-12 19:24:31 -08:00
Mark Palange (Mani)
9054f31f89
Temporary build un breakage - removing broken unit test from build while fixing.
2009-11-12 18:56:55 -08:00
Monroe Linden
4a020b2a1a
Couple LLMimeDiscoveryResponder more tightly with LLViewerMediaImpl. This should fix DEV-41596, as well as other potential problems.
2009-11-12 18:25:42 -08:00
Nyx (Neal Orman)
1aa4e4e68d
EXT-2434 update avatar rendering cost
...
First crack at updating the rendering cost calculation for avatars to account
for the possibility of invisible avatars. Also generalized rendering cost of
attachments to be more general - added debug code to build floater
will be post-reviewed
2009-11-12 20:54:00 -05:00
Erica
bc9daf3ab2
EXT-2433 Fix tab max width on build tools
2009-11-12 17:46:50 -08:00
Loren Shih
999b9e28ce
EXT-2349 : Diagnose warning spam: "[X] is in model and in view, but STRUCTURE flag not set"
...
EXT-2432 : Diagnose warning spam: "[X] does not exist in either view or model, but notification triggered"
Restructured llinventorypanel's handling of add/remove/structure so it's easier to understand
Removed false positive "notification triggered" warning since objects can now exist outside of various inventory panels' directories.
--HG--
branch : avatar-pipeline
2009-11-12 20:36:54 -05:00
Loren Shih
2886d0ec92
EXT-24131 : Diagnose warning spam: "WARNING: LLObjectBridge::performAction: object not found - ignoring"
...
This warning is a false positive, also existed in 1.23. Removing.
--HG--
branch : avatar-pipeline
2009-11-12 20:29:48 -05:00
Loren Shih
2ea1b06440
Backed out changeset: 153709ddee86
...
--HG--
branch : avatar-pipeline
2009-11-12 20:29:07 -05:00
Loren Shih
1bbcc4be83
EXT-24131 : Diagnose warning spam: "WARNING: LLObjectBridge::performAction: object not found - ignoring"
...
This warning is a false positive, also existed in 1.23. Removing.
--HG--
branch : avatar-pipeline
2009-11-12 20:21:33 -05:00
Nat Goodspeed
2f97829aab
Introduce LLEventDispatcher::begin()/end() to iterate over (name, desc) pairs
...
for all registered operations. (untested)
Introduce LLEventDispatcher::getMetadata(name) query so you can discover, for
a given named operation, its query string and required parameters. (untested)
Introduce LLEventDispatcher::add() convenience methods allowing you to omit
description strings. Fix LLLoginInstance (which uses a non-LLEventAPI
LLEventDispatcher) back to description-less add() calls.
However, filter LLEventDispatcher::add() methods inherited by LLEventAPI so
that an LLEventAPI subclass *must* provide a description string.
2009-11-12 20:11:53 -05:00
Steve Bennetts
92cacc5581
Merge with product-engine
2009-11-12 16:47:15 -08:00
angela
0d4ccb9d1c
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 08:43:56 +08:00
Nyx (Neal Orman)
31ceac8289
EXT-1796 right click menu has "take off items" for gestures
...
renamed "take off items" to "remove from outfit"
Code reviewed by Seraph
2009-11-12 19:16:01 -05:00
richard
ffadb3d29f
renamed UIImageDeclaration::scale_rect to scale to be consistent with XML attribute name
2009-11-12 16:13:46 -08:00
richard
5a220b63ca
added comments to textures.xml
2009-11-12 16:01:48 -08:00
Xiaohong Bao
fd9257a5f2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-12 15:44:49 -08:00
Eric M. Tulla (BigPapi)
5e20524681
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 18:37:17 -05:00
skolb
b84213315e
merge
2009-11-12 15:36:44 -08:00
skolb
759cf798c3
EXT-2135 [BSI] Scrolling the TOS agreement makes the entire agreement unreadable
2009-11-12 15:36:04 -08:00
Xiaohong Bao
343b50c765
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-12 15:34:36 -08:00
Loren Shih
b685895dd0
EXT-2426 : Remove COF processing that is causing recursive calls to gInventory.notifyObservers
...
Changing COF processing to happen during idle(), versus within done().
Reviewed by: Vir
--HG--
branch : avatar-pipeline
2009-11-12 18:11:25 -05:00
Nyx (Neal Orman)
7f76507ddc
EXT-2387 crash on dump local textures
...
we didn't check local_tex_obj for NULL before using it. checked to make sure
pointer is not null before calling ->getImage()
2009-11-12 18:08:22 -05:00
Nyx (Neal Orman)
7af2e93265
EXT-2190 share button in IM should open sidepanel inventory
...
share button in im popup now opens sidepanel inventory.
Code reviewed by Seraph
2009-11-12 17:58:31 -05:00
Brad Payne (Vir Linden)
22a20bfecf
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-12 17:24:47 -05:00
Brad Payne (Vir Linden)
56df94412b
LLAppearanceManager cleanup - removed dead code
...
--HG--
branch : avatar-pipeline
2009-11-12 17:20:53 -05:00
Nyx (Neal Orman)
a92c6ef67f
merging put on submenu fix with avatar-pipeline
2009-11-12 17:12:21 -05:00
Nyx (Neal Orman)
8863987cae
EXT-2354 menus contain multiple lines not editable in XUI
...
We're building a pie menu in code, complete with separators for this particular
branch of submenus. This is terrible and ugly and needs to be killed, but
for now I removed the lines that cause the separators to be added where there
are empty pie slices.
Code reviewed by Vir
2009-11-12 17:11:47 -05:00
richard
767e97d2b9
merge
2009-11-12 14:03:29 -08:00
richard
8c90e4d468
DEV-42747 - lltreeiterators_test.cpp broken on Windows
...
reviewed by Nat
2009-11-12 13:54:30 -08:00
James Cook
fc6b3d4caa
merge
2009-11-12 13:45:22 -08:00
Xiaohong Bao
3fe0287d12
do not apply additional decode priority to textures with high boost levels.
2009-11-12 13:40:53 -08:00
Xiaohong Bao
a51285994c
fix a bug of making invisible spatial group visible.
2009-11-12 13:36:39 -08:00
James Cook
ab3cb6d937
Automated merge with ssh://hg.lindenlab.com/james/gooey/
2009-11-12 13:35:39 -08:00
Brad Payne (Vir Linden)
315af3fb82
LLAppearanceManager cleanup - no static at all
...
--HG--
branch : avatar-pipeline
2009-11-12 16:03:59 -05:00
Justin C. Rounds (Chuck)
7adf642ecb
Corrected 9-slice coords (again) for Tooltip.
2009-11-12 15:20:37 -05:00
Brad Payne (Vir Linden)
0b104e2a41
LLAppearanceManager cleanup - turning into proper singleton
...
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00