Commit Graph

3329 Commits (ca5e49d5fab171bc455c58b8f745d7f00d46bb41)

Author SHA1 Message Date
Nyx (Neal Orman) ca5e49d5fa EXT-2718 EXT-2434 avatar render cost changes
Fixing a but in new ARC function where textures added 5 to the ARC for each
use. Expected (and previous) behavior restored, where 5 is added to ARC for each
unique texture, regardless of how many faces it is used on.

Confirmed new ARC is 99 points higher than previous (20 for each body part), or
119 if avatar is wearing a skirt.

Will be post-reviewed before pushing

--HG--
branch : avatar-pipeline
2009-11-23 15:12:48 -05:00
Nyx (Neal Orman) 24dbd81763 EXT-829 share button in profile inactive
refactored share code to all call LLAvatarActions::share.
Function opens an IM window if one doesn't already exist and prints an
appropriate message, as well as opening the inventory sidepanel.

Verified working in IM window, people tab, and individual's profile.

Will be post-reviewed before push.

--HG--
branch : avatar-pipeline
2009-11-23 13:23:54 -05:00
Nyx (Neal Orman) ef63c80766 EXT-2535 wearables created in 2.0 don't load in 1.23
Re-opening issue for a second pass at it. This pass updates the code that was
intended to make all loaded wearables auto-save themselves back to wearable
version 22 (from 24). Code was not being hit, so relocated it to after wearable
had been added to llagentwearables to ensure the save succeeded.

Will be post-reviewed before push.

--HG--
branch : avatar-pipeline
2009-11-23 11:46:15 -05:00
Nyx (Neal Orman) 98c184619b EXT-829 share button in profile inactive
Pass number 2 - re-enabled share button in the locations where it should exist
and disabled it in others. Next pass will be making all buttons functional.

Will be post-reviewed before pushing

--HG--
branch : avatar-pipeline
2009-11-23 11:32:30 -05:00
Nyx (Neal Orman) 52c27b99b8 EXT-829 share button in people panel is inactive
First pass at getting share buttons in the three places we need them:
person's profile
IM window
people panel

Only UI changes so far, functionality in a future checkin.

Will be reviewed before pushing.

--HG--
branch : avatar-pipeline
2009-11-20 17:52:17 -05:00
Nyx (Neal Orman) ac78a7e8b8 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-20 15:32:01 -05:00
Nyx (Neal Orman) f440bc5bcf EXT-2596 EXT-2354 extra lines in put on > attach put on > wear submenus
finishing the cleanup here, missed a couple of extraneous separators.

Will be post-reviewed.

--HG--
branch : avatar-pipeline
2009-11-20 15:31:47 -05:00
Loren Shih f520b1a0be merge
--HG--
branch : avatar-pipeline
2009-11-20 10:33:51 -05:00
Brad Payne (Vir Linden) 3263a6cbad merge
--HG--
branch : avatar-pipeline
2009-11-20 10:01:06 -05:00
Loren Shih 56a861138b EXT-2675 : Folder that contains baseitems for COF doesn't load on first click
EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive

RightClickFetchInventoryObserver now works correctly to update menu
FetchInventoryDescendents now triggers notifyObservers properly
Fixed up gInventory.notifyObservers logic

--HG--
branch : avatar-pipeline
2009-11-19 21:57:14 -05:00
Loren Shih ad86caf479 EXT-2668 : Screwy logic for figuring out if a folder is removable
EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit
EXT-2662 : Can't delete a worn item link

Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children.
Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion.

--HG--
branch : avatar-pipeline
2009-11-19 17:56:30 -05:00
Brad Payne (Vir Linden) fae7834991 cleanup: log file spam
--HG--
branch : avatar-pipeline
2009-11-19 17:36:13 -05:00
Brad Payne (Vir Linden) 62ce5fa462 For EXT-2623 - object missing wearables and attachments on initial login
--HG--
branch : avatar-pipeline
2009-11-19 16:00:40 -05:00
Loren Shih ba5648757c merge
--HG--
branch : avatar-pipeline
2009-11-19 14:22:28 -05:00
Nyx (Neal Orman) 0692284201 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-19 13:55:53 -05:00
Nyx (Neal Orman) ddb7ce4179 EXT-2601 edit appearance: label_min / label_max not translated
strings are already in strings.xml, just had to actually translate the
labels where they were being applied.

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-11-19 13:55:07 -05:00
Loren Shih afbc78d039 Merging viewer-2-0 changes into avatar-pipeline branch
--HG--
branch : avatar-pipeline
2009-11-19 13:36:27 -05:00
Loren Shih 6cea252986 merge
--HG--
branch : avatar-pipeline
2009-11-19 13:19:16 -05:00
Brad Payne (Vir Linden) 0c95f8bf30 For EXT-2623 - object missing wearables and attachments on initial login
--HG--
branch : avatar-pipeline
2009-11-19 12:03:11 -05:00
Tofu Linden 3e46ee6274 Fix "Global Illumintation" typo in the menu text which was bugging me. 2009-11-19 14:22:08 +00:00
Steve Bennetts 884a9887a7 Changes to IM Logging, includes preference changes 2009-11-18 21:42:27 -08:00
Steve Bennetts 7803ba8e0c merge 2009-11-18 18:11:03 -08:00
Steve Bennetts 5acb165025 Change close behavior to not end session.
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
2009-11-18 18:08:59 -08:00
Steve Bennetts ff6eea998d Change close behavior to not end session.
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
Also made the group IM floater a little less broken.
2009-11-18 18:08:32 -08:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Nat Goodspeed 003cac41bc Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 18:16:57 -05:00
Steve Bennetts 3375a71ffb merge 2009-11-18 15:09:17 -08:00
James Cook 81eca4a782 merge 2009-11-18 15:05:04 -08:00
Nat Goodspeed 7bca43582e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 17:59:42 -05:00
Erica a05f63b989 EXT-2638 Add Close X to IM and Chat log windows 2009-11-18 14:43:30 -08:00
Steve Bennetts 2878328bb7 Renamed "close" to "end" in chiclet context menus
Removed "open" in chiclet context menus
Removed some deprecate "..."
Removed ^M from menu_viewer.xml
2009-11-18 14:39:51 -08:00
James Cook 5649faf6d9 merge 2009-11-18 14:33:09 -08:00
Steve Bennetts 5fce305bc6 merge 2009-11-18 14:30:05 -08:00
Steve Bennetts de23a4d92c Merge 2009-11-18 14:29:39 -08:00
James Cook 203490e2a0 Change /me emote formatting to pure italics, not underlined.
Review pending with Richard/Leyla
2009-11-18 14:29:01 -08:00
James Cook a46794bcff EXT-2579 Fix memory leak/bloat due to /me IRC-style emotes.
Pending review with Richard/Leyla
2009-11-18 14:27:58 -08:00
Steve Bennetts dd9f2ca5f5 Merge from product-engine 2009-11-18 14:24:41 -08:00
Loren Shih fb81795a2d merge 2009-11-18 17:20:03 -05:00
Steve Bennetts 3716d1bcf8 merge 2009-11-18 14:15:20 -08:00
Nat Goodspeed ce80f253e5 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 17:10:34 -05:00
Nat Goodspeed 51d5005fa3 Make failure to load lleventhost.dll when requested a fatal error.
This addresses a failure mode Mani encountered when lleventhost.dll wasn't
built. testlangs.py couldn't talk to the newly-launched viewer -- but thinking
that was because it had crashed, it went ahead and launched a whole bunch
more. This fix avoids the possibility of rogue viewer processes on an
unattended test machine.
2009-11-18 17:07:37 -05:00
Steve Bennetts efb512dc65 EXT-2644 - Add "Close Session" option to chicklet context menus 2009-11-18 14:07:35 -08:00
Loren Shih 4a38c90adb EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -05:00
Palmer becfbd2b82 Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-18 13:06:28 -08:00
Loren Shih 3ac552c504 merge 2009-11-18 15:30:40 -05:00
Palmer 8b56d0bece Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-18 12:02:04 -08:00
Palmer 6b81dfb139 Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
Reviewed by Bao
2009-11-18 11:59:09 -08:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Nyx (Neal Orman) 1875d5e37b EXT-2539 confirm we're not sending local texture IDs in appearance msg
created a throwaway function to temporarily set local texture IDs in the avatar
object to IMG_DEFAULT_AVATAR immediately before sending the TE message, and
restore the IDs when we're done. Will implement a more elegant solution for 2.1.
This is the least risky implementation, though it isn't elegant.

Code reviewed by Seraph
2009-11-18 14:48:05 -05:00
Lis Pardi cb8d2cb0ac Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2009-11-18 13:15:32 -05:00