Commit Graph

245 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Brad Payne (Vir Linden) d1d0a2cf67 SH-4058 - log spam reduction initiative. 2013-04-03 14:58:33 -04:00
Don Kjer 662d67e3b5 Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures 2013-03-13 08:46:59 +00:00
Don Kjer f945415210 Large changes to the LLCurl::Responder API, as well as pulling in some changes to common libraries from the server codebase:
* Additional error checking in http handlers.
* Uniform log spam for http errors.
* Switch to using constants for http heads and status codes.
* Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error.
* Reduced spam regarding LLSD parsing errors in the default completedRaw http handler.  It should not longer be necessary to short-circuit completedRaw to avoid spam.
* Ported over a few bug fixes from the server code.
* Switch mode http status codes to use S32 instead of U32.
* Ported LLSD::asStringRef from server code; avoids copying strings all over the place.
* Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob.
* Ported server pretty notation format (and pretty binary format) to llsd serialization.

* The new LLCurl::Responder API no longer has two error handlers to choose from.  Overriding the following methods have been deprecated:
** error - use httpFailure
** errorWithContent - use httpFailure
** result - use httpSuccess
** completed - use httpCompleted
** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers.

* In order to 'catch' a completed http request, override one of these methods:
** httpSuccess - Called for any 2xx status code.
** httpFailure - Called for any non-2xx status code.
** httpComplete - Called for all status codes.  Default implementation is to call either httpSuccess or httpFailure.
* It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below).

* Uniform error handling should followed whenever possible by calling a variant of this during httpFailure:
** llwarns << dumpResponse() << llendl;
* Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context.

* In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed.
* Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class).
* Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods:
** successResult - Sets results and calls httpSuccess
** failureResult - Sets results and calls httpFailure
** completedResult - Sets results and calls httpCompleted

* To obtain information about a the response from a reponder method, use the following getters:
** getStatus - HTTP status code
** getReason - Reason string
** getContent - Content (Parsed body LLSD)
** getResponseHeaders - Response Headers (LLSD map)
** getHTTPMethod - HTTP method of the request
** getURL - URL of the request

* It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO.

* See indra/llmessage/llcurl.h for more information.
2013-03-13 06:26:25 +00:00
prep linden 0123ab0dc6 Removed unneeded code. 2013-03-12 11:02:00 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Brad Payne (Vir Linden) 70e22de2bb SH-3860 WIP - fixes the cloud on initial login, still have a COF version rae condition due to creation of the base outfit link 2013-03-01 09:06:40 -05:00
Brad Payne (Vir Linden) 2b6d7e5005 SH-3860 WIP - fixes for initial COF loading and config 2013-02-27 17:58:43 -05:00
Brad Payne (Vir Linden) b16dcda6a3 SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, log appearance request results 2013-02-25 19:12:36 -05:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Gilbert Gonzales d41202336b CHUI-303: Problem was that the prior solution only updated (using dirtyFilter()) the inventory window that the paste occurred in. Resolution: Now each inventory window calls dirtyFilter(), which then determines visibility of the pasted item. 2012-09-04 14:21:25 -07:00
Richard Linden 4285cc271e CHUI-217 FIX Items are not visible in Merchant Outbox
cleaned up a lot custom code for folder view item creation in inbox and outbox
proper initialization of views from inventory panel starting folder
2012-07-30 15:15:42 -07:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
AlexanderP ProductEngine 3ae21b429e CHUI-207 FIXED Emptying Lost and Found and Trash in inventory crashes viewer 2012-07-20 17:16:22 +03:00
Merov Linden efa73d4975 CHUI-236 : WIP : Places panel works for My Inventory but still empty lists for Favorites Bar, My Landmarks and Library. 2012-07-19 20:38:07 -07:00
merov_linden 15f6f877f9 CHUI-236 : WIP : Modify the handling of FT_ROOT_INVENTORY which was creating havoc in LLInventoryModel instantiation. Still, some of those hack will have to come back on. 2012-07-19 03:57:24 +01:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Richard Linden 4775084000 CHUI-101 WIP Make LLFolderview general purpose
inventory item labels and icons displaying again
2012-06-21 23:28:24 -07:00
Brad Payne (Vir Linden) 6ee0456220 merge 2012-06-04 15:28:08 -04:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Oz Linden 7637acf76e merge changes for DRTVWR-149 2012-05-22 06:03:42 -04:00
Nat Goodspeed ee87fd975f DRTVWR-136: Remove redundant remove_(item|category)() functions.
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
2012-04-14 22:23:24 -04:00
Oz Linden f79b775fcc merge changes for drtvwr-136 2012-04-13 20:55:47 -04:00
Nat Goodspeed b7e0e44e32 CHOP-854: Use new LLInventoryModel::removeObject() to discard offer.
Introduce new LLInventoryModel::removeCategory() method comparable to
removeItem(), but for folder objects (using changeCategoryParent() rather than
changeItemParent()). Introduce removeObject() method that calls one of the
above, depending on runtime object type.
2012-03-27 22:39:31 -04:00
Nat Goodspeed b8561da34d CHOP-854: Make LLInventoryModel::removeItem() call changeItemParent().
The body of removeItem() was already nearly identical to the body of
changeItemParent(); this eliminates the redundancy.
Improve logging for changeItemParent().
2012-03-27 19:06:33 -04:00
Nat Goodspeed fdd018783a CHOP-854: move change_(item|category)_parent() into LLInventoryModel.
It's not really clear why they're in llinventoryfunctions.{h,cpp} instead of
LLInventoryModel, and in fact LLInventoryModel::removeItem() already contains
code essentially cloned from change_item_parent() -- or perhaps vice-versa.
This changeset addresses only migrating the functions, and fixing up existing
references, to simplify code review.
2012-03-27 18:40:17 -04:00
Brad Payne (Vir Linden) b0b1634bd2 fixed typo 2012-03-22 18:33:02 -04:00
Nyx (Neal Orman) e1a10fd81c SH-3040 FIX Inventory caching issues
A complete fix for a single cause of caching issues, does not solve all caching issues.
Fixes the issue of inventory links that were incorrectly being marked as broken.
Broken links get a second chance to see if their base objects exist in inventory now.
2012-03-20 17:31:14 -04:00
Merov Linden 8270054805 EXP-1915 : Rewrote the fetching mechanism for folders making it truly recursive. 2012-03-13 21:08:10 -07:00
Merov Linden 7b866448db EXP-1922 : Skip the clipboard elements when purging the trash when in cut mode 2012-03-12 13:59:25 -07:00
Paul ProductEngine b57a6186a2 MAINT-841 FIXED ([PUBLIC]Folder "Lost and found" isn't cleaned)
- This happens if something was added to the category before it was initialized,
so accountForUpdate didn't update descendent count and thus the category thinks
it has fewer descendents than it actually has.
2012-04-12 18:46:27 +03:00
Leslie Linden 1422be8312 Merge from viewer-development 2012-01-09 09:56:52 -08:00
Aura Linden bd3a652eab Add capability-based create folder routine for more reliable inventory, with fix for copy and wear 2012-01-06 07:46:53 -05:00
Leslie Linden 2e564abcd6 EXP-1730 FIX
EXP-1731 FIX
EXP-1735 FIX
EXP-1736 FIX
EXP-1737 FIX
EXP-1738 FIX
EXP-1739 FIX

* Users can no longer drag and drop items to the outbox from in world, notecards or the library.
* Drag and drop now blocks the creation of hierarchies that are too deep, too many folders or contain too many items.
* Settings now exist to specify drag and drop limitations to the outbox, named:
       InventoryOutboxMaxFolderDepth (4)
       InventoryOutboxMaxFolderCount (20)
       InventoryOutboxMaxItemCount (200)
2011-12-15 14:26:42 -08:00
Leslie Linden 130d017085 * Updated inventory code to handle creation of the "Received Items" panel when
the sim notifies the viewer that the folder is created.  Unfortunately, the
  sim is not yet doing this so a relog is required to properly get this working.
2011-10-31 12:01:10 -07:00
Merov Linden 5676e4a62e EXP-1439 : Modify DaD on the Favorite toolbar so that reordering visible landmarks don't send any back to the end of the list 2011-10-21 18:36:06 -07:00
Aaron Stone 5e989213ad CHOP-761 Items now disappear when the sim says so. 2011-07-27 16:24:08 -07:00
Aura Linden 6d789f59f8 Added handling for RemoveInventoryObjects message. Fixed handling of RemoveInventoryFolder 2011-07-21 17:07:05 -07:00
Leyla Farazha 9847f5674c MKT-3227 DD clothing and bodyparts forced to worn arriving in inbox 2011-06-30 14:59:12 -07:00
Brad Payne (Vir Linden) 0e99a8b2c5 SH-1492 WIP 2011-05-20 15:52:33 -04:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Seth ProductEngine 67f33bff1b STORM-1042 FIXED Fixed the inventory observers of newly added items.
The problem was caused by an outdated message name stored in LLInventoryObserver::mMessageName and not updated properly in LLInventoryModel::notifyObservers().
The message name used in LLInventoryAddedObserver::changed() was the name of the message most recently passed by LLInventoryModel::notifyObservers(), instead of the name of the latest actually received message. Using the most recent message name in this case fixed the problem.
2011-04-12 03:00:05 +03:00
Leyla Farazha a2c659378b SH-1203 Remove "meshes" folder from inventory 2011-03-23 11:35:07 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Vadim Savchuk 75a66a146b EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo.
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/

--HG--
branch : product-engine
2010-08-26 18:59:08 +03:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks e68f9e566b merge 2010-08-31 16:37:40 -05:00
Brad Payne (Vir Linden) ca1224fd79 EXT-8360 FIX - item name changes get propagated to the various appearance panel widgets 2010-07-20 10:44:27 -04:00
Mike Antipov 14724102f3 EXT-8319 FIXED Added method to localize inventory categories having predefined names, updated predefined keys for "Male - Get lost" and "Female - Get lost".
There were two issues:
 * "Male - Get lost" and "Female - Get lost" gestures have by 2 spaces before "-" in their names.
 * Folders were not processed to be localize. This was not implemented correctly in EXT-7051.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/753/

--HG--
branch : product-engine
2010-07-14 16:25:17 +03:00
Loren Shih a5522ff5bd EXT-3568 FIXED Outfit Folders sometimes show up as empty until right-clicked
Changed logic to not set descendent count to 0 for problematic folders.
2010-07-07 10:12:37 -04:00
Loren Shih 4ae0a0703b EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15 17:58:08 -04:00
Loren Shih 0be5ce0a59 EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode.  Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
Mike Antipov fe5d72a7c3 EXT-7503 WIP Improved LLInventoryModel::updateItem to avoid an extra calls of notifyObservers while updating calling card item.
- added check on whether avatar name exists in Name Cache before using its getter with callback (which raises notifyObservers).

Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/526/

--HG--
branch : product-engine
2010-06-08 15:13:43 +03:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Loren Shih 35fb83e1e3 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Removed llinfos that was causing excessive spam.
2010-05-25 16:05:17 -04:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
Loren Shih 358d23a3a0 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24 16:39:34 -04:00
Loren Shih ee53b612fb EXT-7324 : INFRASTRUCTURE: Inventorymodel code cleanup
Superficial header file cleanup
Lots of moving functions around and recategorizing in LLInventoryModel.h
Removed some obsolete functions, changed scoping of others
Moved some static functions from LLInventoryModel into llinventoryfunctions.h
2010-05-12 16:46:28 -04:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Loren Shih 909091cc0c EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
Loren Shih 5861a2faf2 EXT-3414 : Move static backgroundfetch methods and variables to llinventorymodel subclass
Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-03-30 11:49:15 -04:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
Loren Shih 2a60fdb197 EXT-5296 : Inventory folders revert to defort "sort" with each login
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code.  Makes this sorting code a lot easier to debug.
2010-03-04 15:29:49 -05:00
Tofu Linden a0c57cbb82 CID-207 assert. 2010-02-13 14:05:09 +00:00
Tofu Linden 74ffa0fa48 CID-207
Checker: REVERSE_INULL
Function: LLInventoryModel::addItem(LLViewerInventoryItem *)
File: /indra/newview/llinventorymodel.cpp
2010-02-13 14:04:26 +00:00
Tofu Linden fc70ca5403 PE merge. 2010-02-03 15:52:44 +00:00
Mike Antipov 2a77ef80ce Backed out changeset 5add97e5b6cf
Related to major bug EXT-3985 [BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x
Removed auto-cleanup patch to repair Lanmarks in Favorite bar (remove LM Sort prefixes)

--HG--
branch : product-engine
2010-02-03 14:18:06 +02:00
Loren Shih 85cc9f121d EXT-4874 : Client freezes on right click - take item
Fixed infinite loop due to parent_id not being incremented properly in loop.
2010-02-02 20:25:48 -05:00
Vadim Savchuk db4e46e93d Mere from default branch
--HG--
branch : product-engine
2010-01-29 16:46:06 +02:00
Mike Antipov a08f098847 Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
-- implemented patch to remove LM prefixes from landmarks' names
*NOTE: It will be unnecessary after the first successful session in viewer 2.0.
Can be removed before public release.

Implementation details:
At the first run with this patch it patches all cached landmarks: removes LM sort prefixes and
updates them on the viewer and server sides.
Also it calls fetching agent's inventory to process not yet loaded landmarks too.
If fetching is successfully done it will store special per-agent empty file-marker
in the user temporary folder (where cached inventory is loaded) while caching agent's inventory.
After that in will not affect the viewer until cached marker is removed.

--HG--
branch : product-engine
2010-01-29 10:11:53 +02:00
Rick Pasetto dc47f52e9f merge 2010-01-21 18:40:37 -08:00
Leyla Farazha 9ab7d647c1 EXT-3416 Can't name a new gesture on creation (and renaming is HARD)
reviewed by Callum
2010-01-21 15:09:38 -08:00
Tofu Linden 62ab590b16 trivial comment fix. 2010-01-18 15:41:12 -08:00
Mike Antipov 6e67ac5e02 Fixed low bug EXT-4311 (Order of items in 'Favorites Bar' folder remains non-changed if change its order in the 'Favorites Bar')
-- reason: there was two places where identical resorting of Favorite landmarks functionality was implemented: InventoryBridge & Favorite bar.
    It was not impelnmented properly in favorites bar: LLInventoryObserver::SORT flag was not set after d-n-d.
-- fix: moved identical functionality to update & save order of Favorite landmarks from these places to Inventory Panel

--HG--
branch : product-engine
2010-01-15 18:02:42 +02:00
Mike Antipov 06838dfd57 Work on normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- refactoring: move functionality to rearange Favorite landmarks from Inventory Folder bridge to Inventory model
-- improved logic to place dragged landmark before target one.

--HG--
branch : product-engine
2010-01-15 19:56:37 +02:00
Loren Shih f16d357b3b EXT-4271 : Remove "LLInventoryModel::accountForUpdate accounted..." spam
Took out llinfos spam.
2010-01-14 20:26:36 -05:00
Loren Shih b134bf554d EXT-4319 : Category descendent count fails to increment if descendent received while cat still fetching
EXT-4320 : Mismatch in folder descendents count is causing fetch descendents to never complete
EXT-2244 : My Outfits bars should be populated from Library on first 2.0 login

Implemented a workaround for an issue where descendent count was becoming unsynchronized.  EXT-4320 is the workaround, this solves for EXT-2244, and EXT-4319 is the actual bug (whose fix is still pending).
2010-01-14 13:54:15 -05:00
Yuri Chebotarev dd20b16ed0 no ticket. HACK !!!.
HACK code to fix inventory root folder for some broken accounts
code executed only once and takes O(N) where N - number of inventory items.

--HG--
branch : product-engine
2009-12-23 18:13:57 +02:00
Brad Payne (Vir Linden) 97031cb90d merge 2009-12-21 17:28:06 -05:00
Brad Payne (Vir Linden) ced5b819d7 For EXT-3567: Folders should show as 'Loading...' when contents being fetched 2009-12-21 17:21:48 -05:00
Loren Shih c26034531a EXT-3582 : My Outfits populates from library if I delete my last outfit
Autopopulation logic is now smarter and only triggers if this is the first time you're logging into viewer2.0.
2009-12-21 16:49:14 -05:00
Loren Shih 37b04c1507 EXT-3582 : My Outfits populates from library if I delete my last outfit
Tracking a "Is this my first time in viewer2.0?" flag and only populating My Outfits folder if it's true.
2009-12-21 14:54:55 -05:00
Loren Shih 3e75137f26 EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
Loren Shih d4b888d478 EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory accordion
Put in a quick fix so that folders can't be made reparented to their own children.

--HG--
branch : avatar-pipeline
2009-12-08 17:31:02 -05:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00