Commit Graph

2908 Commits (acdce232994fce7edf9a67a360db2368c5ad6594)

Author SHA1 Message Date
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
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
Loren Shih 7a1e7dd69d merge
--HG--
branch : avatar-pipeline
2009-11-13 16:21:11 -05:00
Loren Shih f0cd44a6a2 EXT-2482 : Newly created folders have wrong default type
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused.  Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear.

This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type.

--HG--
branch : avatar-pipeline
2009-11-13 16:18:53 -05:00
Nyx (Neal Orman) 2aa9f1bcbe EXT-2477 minimizing while in appearance editing mode leaves a bad state
when minimizing the viewer while in appearance editing mode with unsaved changes
kicks you out of appearance editing mode and leaves you unable to recover as
the editor always starts itself on the shape tab. Fixed this in two ways:

1) if a wearable is dirty when the editor is opened, that is the tab that is
   selected.

2) the camera mode is not forcibly changed away from appearance editing mode
   on minimize. This only needs to happen if we are in mouselook.

Code reviewed by Vir.

--HG--
branch : avatar-pipeline
2009-11-13 14:57:06 -05:00
Loren Shih 0fb0ce836d EXT-2428 : Wearing a look should update the "Current Look" sidepanel string
Both double-clicking on an outfit to wear, and wearing an outfit from side panel, will now update the current look string.

--HG--
branch : avatar-pipeline
2009-11-13 14:42:28 -05:00
Brad Payne (Vir Linden) d065a185e0 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 11:45:16 -05:00
Brad Payne (Vir Linden) 036b0b7d8d removed dead code that was triggering a warning on some platforms
--HG--
branch : avatar-pipeline
2009-11-13 11:43:32 -05:00
Eric M. Tulla (BigPapi) 885bd589f5 merging changes accidentally made to default into avp branch
--HG--
branch : avatar-pipeline
2009-11-13 11:20:26 -05:00
Nyx (Neal Orman) 69f4b29761 EXT-2434 update rendering cost to reflect changes in avatar rendering
finished the updates to avatar rendering cost and formalized the
display of selected object render cost in the build tools floater.

Both checkins reviewed by Vir.
2009-11-13 11:11:11 -05:00
Loren Shih 3b730cef75 merge
--HG--
branch : avatar-pipeline
2009-11-13 11:10:29 -05:00
Loren Shih cf6e4c5059 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-13 11:08:45 -05:00
Loren Shih 606256b9e6 Removed llinfos spam on prefetched items (changed to lldebugs).
--HG--
branch : avatar-pipeline
2009-11-13 11:08:28 -05:00
Brad Payne (Vir Linden) f36c43abde branch merge
--HG--
branch : avatar-pipeline
2009-11-13 09:35:37 -05: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
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
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
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
Brad Payne (Vir Linden) 315af3fb82 LLAppearanceManager cleanup - no static at all
--HG--
branch : avatar-pipeline
2009-11-12 16:03:59 -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
Tofu Linden 4acc05b379 merge latest batch of stuff from viewer2voiceparity 2009-11-12 19:36:24 +00:00
Loren Shih dd9abe71c2 merge 2009-11-12 14:05:55 -05:00
Loren Shih d53a354a9c Rename LLInventoryObservers to LLInventoryObserver 2009-11-12 13:56:36 -05:00
Loren Shih 0bcc6626e1 merge 2009-11-12 13:47:10 -05:00
Loren Shih 6eb5f380e3 Extracted LLInventoryObserver classes from LLInventoryModel.h into their own subclass, LLInventoryObservers.h. This reduces dependencies and compile times, and makes these classes easier to locate.
I have not yet refactored classes to remove #include "llinventorymodel.h" and replace with #include "llinventoryobservers.h".  This will happen later.
2009-11-12 13:40:01 -05:00
Tofu Linden e5a2b1c458 merge. 2009-11-12 17:58:40 +00:00
Mark Palange (Mani) a5f6da0975 merge 2009-11-12 09:26:54 -08:00
Mark Palange (Mani) f9f2852ff2 DEV-42715 Fixed lllogin SRV request timeout unit test.
Also made SRV config options not persistent.
reviewed by brad
2009-11-12 09:19:32 -08:00
James Cook 7a45dec2d5 merge 2009-11-12 08:53:20 -08:00
James Cook d6136a40b1 merge 2009-11-12 08:29:38 -08:00
Brad Payne (Vir Linden) de6ca4c5ea Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:20:57 -05:00
Tofu Linden 74cb5c82a4 fix silly error that was nerfing the outgoing call dialog.
more work towards a decent DEV-42312 and DEV-42313
2009-11-12 16:01:29 +00:00
Tofu Linden 64c1146213 add Cancel button to outgoing call dialog, make it work (perhaps), make the name of the departing voice session more accurate (perhaps). WIP. 2009-11-12 15:35:08 +00:00
Brad Payne (Vir Linden) c8c0c51bf6 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 10:28:41 -05:00
Loren Shih e2a40ec0ca merge 2009-11-12 10:06:57 -05:00
Tofu Linden c2b227c939 more inching towards outgoing call popup goodness... 2009-11-12 14:28:57 +00:00
Tofu Linden 7cf3008da7 more work on the outgoing call popup... 2009-11-12 14:15:19 +00:00
Tofu Linden 095a3d4372 more mimicking of the good parts of the incoming_floater! 2009-11-12 13:33:54 +00:00
Lynx Linden 95adfa4cac merge 2009-11-12 13:06:37 +00:00
Lynx Linden 40731c7eb8 DEV-2925: Remove a null char at the end of the location string. 2009-11-12 12:57:34 +00:00
Lynx Linden daefef6e66 DEV-2925: Remove support for secondlife:///app/objectim URLs.
These are no longer generated in Viewer 2.0 (instead we use
notifications to send object IMs to the user), so there's no
need to look for them in every textbox. Users can get details
on any objects spamming them via the new remote object inspector.
2009-11-12 12:43:18 +00:00