Don Kjer
a85fa3b10a
Adding support for COPY methods to httpclient. Implementing viewer-side use of AISv3 COPY library folder operation. (SH-4304)
2013-07-11 15:15:04 -07:00
Brad Payne (Vir Linden)
6ba85bd6b3
SH-4305 WIP - unlock and set loading complete after base outfit saved.
2013-07-03 16:01:32 -04:00
Brad Payne (Vir Linden)
ca16e3ad26
SH-4226 WIP - small tweaks
2013-07-03 13:34:11 -04:00
Brad Payne (Vir Linden)
8f4f745230
SH-4226 WIP - try to be smarter about when to send appearance update requests, removed many redundant calls
2013-07-03 12:45:56 -04:00
Brad Payne (Vir Linden)
1c0c8a8a20
merge
2013-06-27 15:42:10 -04:00
Brad Payne (Vir Linden)
cda919cdbf
SH-4300 WIP - comment
2013-06-27 15:37:57 -04:00
Brad Payne (Vir Linden)
47fb1fc67b
SH-4300 WIP - added callback for a non-callback case of updateClothingOrderingInfo. Also removed some wrong code for drag-and-drop corresponding to a case that's not allowed anyway.
2013-06-27 15:30:14 -04:00
Brad Payne (Vir Linden)
8090388a27
SH-4300 WIP - removed outfit autopopulate
2013-06-27 14:41:06 -04:00
Brad Payne (Vir Linden)
4c75140008
SH-4300 WIP - added order validation
2013-06-27 11:43:06 -04:00
Nyx Linden
f388b32137
merge
2013-06-26 17:57:40 -04:00
Nyx Linden
ec00f7f14f
SH-4226 FIX wearing petite outfit gives appearance responder errors
...
Requesting appearance updates on updateGeometry for the avatar was spamming
the back-end and causing the throttling mechanism to get hit. Removing that
caused a re-introduction of SH-4109, so added a callback to link creation
in the COF for attachments to request an appearance update.
This should cause us to request an appearance update once per attachment
attached, where before we were seeing up to 8 redundant requests.
2013-06-26 17:57:10 -04:00
Brad Payne (Vir Linden)
5be12cf0be
SH-4300 WIP - set wearable ordering desc fields in slammer during updateCOF(), should need to go item-by-item fairly rarely.
2013-06-26 17:40:41 -04:00
Brad Payne (Vir Linden)
1f133213b9
SH-4300 WIP - removed unused update_base_outfit stuff in updateClothingOrderingInfo()
2013-06-26 15:44:28 -04:00
Brad Payne (Vir Linden)
fd2893e23d
SH-4305 WIP - cleanup
2013-06-26 12:19:38 -04:00
Brad Payne (Vir Linden)
cbb83180e8
SH-4305 WIP - one more case where we need to use slammer to update category
2013-06-26 11:27:13 -04:00
Brad Payne (Vir Linden)
e2e198d9b3
SH-4305 WIP - fix for compiler grumbling on linux build.
2013-06-26 10:50:07 -04:00
Brad Payne (Vir Linden)
ffd7b0d7e7
SH-4305 WIP
2013-06-25 17:52:02 -04:00
Brad Payne (Vir Linden)
bbdd2a34d0
SH-4243 FIX - removed wait for category creation, since callback-based cap only works correctly if a recent fix is deployed server-side. May revisit at some point.
2013-06-25 10:00:46 -04:00
Brad Payne (Vir Linden)
3e0e236f33
SH-4243 WIP - cleaned up callback structure for createNewCategory, modified makeNewOutfitLinks() to wait for category creation before populating.
2013-06-24 15:42:27 -04:00
Brad Payne (Vir Linden)
4ffc162492
SH-4263 FIX - added yet another level of callback kludgery to updateAppearanceFromCOF()
2013-06-19 16:17:33 -04:00
Brad Payne (Vir Linden)
27fc270c73
SH-4262 WIP - fix for the reordering bug in AIS regions.
2013-06-18 16:51:37 -04:00
Brad Payne (Vir Linden)
56cf4297f3
SH-4250 WIP - logging tweaks and cleanup
2013-06-13 16:07:02 -04:00
Brad Payne (Vir Linden)
b1769b6a60
SH-4234 FIX - the only persistent failure seen was caused by a broken link in the outfit. Modified updateIsDirty() to ignore broken links.
2013-06-06 13:55:27 -04:00
Brad Payne (Vir Linden)
a5e41af809
merge
2013-06-05 16:28:33 -04:00
Brad Payne (Vir Linden)
ca806315a9
SH-3635 WIP - logging cleanup, moved some big dumps into separate XML files
2013-06-05 15:52:44 -04:00
Brad Payne (Vir Linden)
63940048ef
SH-4166 WIP - COF-slammer infrastructure working for non-AIS case.
2013-06-03 17:09:25 -04:00
Brad Payne (Vir Linden)
9552f733ef
SH-3635 WIP
2013-05-31 13:54:32 -04:00
Nyx Linden
7f2cf1fa9c
SH-4147 FIX Macro avatar hover gets reset on relog
...
Hover minimum enforcement was getting triggered on relog for macro avatars before
the joint offsets were applied when loading the avatar.
Added code to verify that all attachments in COF have been rezzed, and all
attached objects are not in the process of being rebuilt to the enforcement code.
This should verify that we only apply the hover value enforcement when all rigged meshes
are actually loaded before enforcing minimum hover value
2013-05-30 17:44:51 -04:00
Brad Payne (Vir Linden)
faaf8ba5c7
SH-4222 FIX, SH-3635 WIP - start of stuck-appearance checker, always increment folder version when a contained item is updated.
2013-05-29 14:54:59 -04:00
Brad Payne (Vir Linden)
34d2cd0376
SH-4207 WIP - use item updates with callback when updating link descriptions. Reworked updateAppearanceFromCOF() cof-validation stages.
2013-05-24 15:51:33 -04:00
Brad Payne (Vir Linden)
6c56c77ec5
SH-4027 WIP - initial implementation of item update via AIS.
2013-05-24 08:53:21 -04:00
Brad Payne (Vir Linden)
14a3c5187b
SH-4175 WIP - removed a case where we request to delete the base outfit link twice when changing outfits
2013-05-16 14:40:04 -04:00
Brad Payne (Vir Linden)
8a4add76b4
SH-4175 WIP - Avoid add to outfit or remove from outfit when an outfit change is already in progress
2013-05-15 18:08:12 -04:00
Brad Payne (Vir Linden)
96a2173c64
SH-4176 WIP - allow retries on 4xx errors if enabled by flag. So enable in the case of appearance requests.
2013-05-10 09:32:30 -04:00
Brad Payne (Vir Linden)
43224062a6
SH-4176 WIP - avoid raw dump of whole error contents in log file
2013-05-10 09:19:34 -04:00
Brad Payne (Vir Linden)
55e686b0e3
SH-4176 WIP - tweaks to debugCOF(), which shows differences between viewer and server side views of the COF when a mismatch occurs
2013-05-10 07:52:22 -04:00
Brad Payne (Vir Linden)
d4e537b3ef
SH-4176 WIP - made debugCOF() slightly harder to get to.
2013-05-09 16:41:55 -04:00
Graham Madarasz
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
Graham Madarasz
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
Brad Payne (Vir Linden)
ae53d22141
SH-4140 FIX, SH-3860 FIX - appearance on first-time login should now be reliable without depending on retries of appearance update requests. May still see COF mismatch errors in the log - these will only be fixed, if at all, with AISv3 integration.
2013-04-29 16:59:10 -04:00
Brad Payne (Vir Linden)
eb88e4d378
SH-4128 WIP - cleanup around item link removal and callbacks
2013-04-24 18:08:20 -04:00
Brad Payne (Vir Linden)
a9fa707a7d
SH-4128 - more cleanup of COF-link manipulating functions
2013-04-24 16:09:33 -04:00
Brad Payne (Vir Linden)
4967998a5c
CHUI-849 WIP, SH-4116 WIP - added simpler match check in inventory for when we don't need the list of matches to be returned.
2013-04-24 13:27:04 -04:00
Brad Payne (Vir Linden)
1bf6688561
SH-4128 WIP - rewiring various link-deleting operations to support callbacks
2013-04-23 15:52:12 -04:00
Brad Payne (Vir Linden)
d807a91626
SH-4128 WIP - more stages of outfit change now go through the callback mechanism for link removals
2013-04-22 16:48:02 -04:00
Brad Payne (Vir Linden)
7b52a41e34
SH-4116 WIP - removed follow_folder_links behavior, which was used nowhere and isn't really desirable currently
2013-04-18 17:49:10 -04:00
Brad Payne (Vir Linden)
17af76fae1
SH-4128 WIP - use the AISv3 inventory cap when available for cof link deletion, hook in to callback mechanism so all link operations should be done before outfit is worn.
2013-04-18 13:56:16 -04:00
Brad Payne (Vir Linden)
14ca6a1247
SH-4061 WIP - moved retry policy to llmessage, added integration test
2013-04-11 11:18:16 -04:00
Nyx Linden
b4c60f4303
merge. pulled in sunshine-stable.
2013-04-08 17:03:24 -04:00
Nyx Linden
3e53ade13e
merge
2013-04-05 15:24:22 -04:00
Don Kjer
beeefb4526
Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it more clear which header strings should be used for incoming vs outgoing situations.
...
Using constants for commonly used llhttpnode context strings.
2013-04-04 21:50:45 +00:00
Brad Payne (Vir Linden)
d1d0a2cf67
SH-4058 - log spam reduction initiative.
2013-04-03 14:58:33 -04:00
Nyx Linden
d02296d51b
pulling in sunshine-stable
2013-03-27 15:32:13 +00:00
Brad Payne (Vir Linden)
de2c88ca43
Moved LastUpdateCOF stuff to avatar, so we can track last received for non-self avs
2013-03-22 12:17:06 -04:00
Don Kjer
30ba176d18
Automated merge
2013-03-13 22:43:52 +00:00
Nyx Linden
6f193d54da
SH-3806 FIX test case for local bakes being wrong
...
Local bakes were following folder links in some cases, causing unworn items to be rendered.
Fixed the cof fetcher, now they should no longer show up.
2013-03-13 17:52:40 -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
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
Don Kjer
9a0c52a247
Adding debug setting to allow overriding appearance service url
2013-03-05 11:28:06 -08:00
Don Kjer
2efe411a4f
Reducing amount of cof link data sent to appearance update service. Allowing links to items with 'null' asset ids to be passed
2013-03-04 12:02:02 -08:00
Don Kjer
ec1bc19d01
Adding md5sum calculation to experimental server appearance update message
2013-03-04 01:09:45 -08:00
Don Kjer
8410887e2e
Adding DebugAvatarExperimentalServerAppearanceUpdate setting to test sending full cof contents
2013-03-03 23:32:48 -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)
ecb3d1d64d
SH-3932 FIX - added LLSD blob for viewer-side cof contents, optionally included with request appearance update
2013-02-28 15:58:56 -05:00
Brad Payne (Vir Linden)
22f0515599
SH-3899 WIP
2013-02-28 14:53:53 -05:00
Brad Payne (Vir Linden)
c14b43b5bf
SH-3899 WIP - detailed logging of cof mismatch errors
2013-02-28 11:47:14 -05:00
Brad Payne (Vir Linden)
10acb5d321
merge
2013-02-28 08:40:28 -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)
41d3b428e1
Increase number of retries for requestServerAppearanceUpdate()
2013-02-27 15:17:31 -05:00
Richard Linden
83eda3f152
Automated merge with https://bitbucket.org/lindenlab/sunshine-internal
2013-02-27 11:19:17 -08:00
Brad Payne (Vir Linden)
df3f6f6cac
Fix for mac build failure this time for sure
2013-02-27 11:59:44 -05:00
Brad Payne (Vir Linden)
72412e1b42
Fix for mac build failure
2013-02-27 11:55:08 -05:00
Brad Payne (Vir Linden)
d9d5c7e0cc
SH-3899 WIP - more verbose logging of appearance request status, debug option to force failures for testing
2013-02-27 11:38:12 -05:00
Brad Payne (Vir Linden)
26ac109772
SH-3899 WIP - more logging of appearance message info
2013-02-26 22:00:50 -05:00
Brad Payne (Vir Linden)
d679ad47d5
cleaned up old message
2013-02-26 07:45:50 -05:00
Brad Payne (Vir Linden)
6fe74c21ad
merge
2013-02-25 19:14:45 -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
Nyx Linden
9233f08ddb
SH-3892 SH-3896 SUN-28 FIX add to outfit behaves like replace outfit
...
Conversion away from retry mechanism missed one case which was not supporting
the 'add' operation properly. Changed code to use linkAll instead, as it
did previously.
2013-02-25 18:19:08 -05:00
Brad Payne (Vir Linden)
7fba28471a
merge
2013-02-13 10:21:33 -05:00
Brad Payne (Vir Linden)
9ef4c33772
SH-3852 WIP - modified metrics for update_appearance_from_cof and wear_inventory_category, end when bakes are fully loaded
2013-02-13 07:47:24 -05:00
Nyx Linden
fe9fb67aea
SH-3859 FIX adding or removing clothing in appearance edit mode are visible
...
Added check to cancel any appearance update requests that occur while in appearance edit mode.
Closing appearance edit mode does trigger an update, so should be safe to cancel intermediate
requests without further changes.
2013-02-12 18:37:01 -05:00
Brad Payne (Vir Linden)
e11fd0a7eb
SH-3852 WIP - added more specific logging of completenesss of texture loading
2013-02-12 10:58:04 -05:00
Brad Payne (Vir Linden)
99d197d021
SH-3852 WIP - track per-timer stats
2013-02-07 19:14:00 -05:00
Brad Payne (Vir Linden)
cbf7de4538
SH-3779 WIP, SH-3534 WIP - more bake-status tracking
2013-01-28 13:47:00 -05:00
Brad Payne (Vir Linden)
e378effca3
Added cof version information to DebugAvatarAppearanceMessage output
2013-01-22 21:47:35 -05:00
Brad Payne (Vir Linden)
6a8947679c
SH-3645 WIP - preserve item order after wearable save as
2013-01-16 11:34:42 -05:00
Brad Payne (Vir Linden)
f48011e4d0
SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2013-01-15 20:30:20 -05:00
Brad Payne (Vir Linden)
0f753a530b
SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. Disabled inventory retries for now.
2013-01-11 11:36:11 -05:00
Brad Payne (Vir Linden)
5e7f36541b
SH-3639 WIP - increased retry interval to allow for intermittent extremely slow responses
2013-01-10 13:22:48 -05:00
Brad Payne (Vir Linden)
cd71008781
SH-3604 WIP - more frequent polling for retries
2012-12-18 13:07:01 -05:00
Brad Payne (Vir Linden)
67c66a12ab
SH-3604 WIP - fixed a case with retry logic
2012-12-18 12:45:10 -05:00
Brad Payne (Vir Linden)
42496cd672
SH-3629 WIP - avoid clobbering links to desired items that are already in the COF, as will be the case when wearing an outfit with required body parts missing
2012-12-17 18:34:13 -05:00
Brad Payne (Vir Linden)
fb99b1a1b4
SH-3629 WIP - fixed out-of-order outfit items
2012-12-17 16:51:25 -05:00
Brad Payne (Vir Linden)
b86a3e39cf
SH-3604 FIX - resolved an issue with simulated failures/retry logic
2012-12-17 13:24:57 -05:00
Logan Dethrow
9015344f8e
Merged SH-3339 work with sunshine-internal. Still a WIP.
2012-12-13 18:35:07 -05:00
Brad Payne (Vir Linden)
507080795f
SH-3604 WIP - fixed a failure when base outfit link did not need to be created
2012-12-12 15:32:31 -05:00
Brad Payne (Vir Linden)
46cfca5ed6
Fix for problem found with changing to an outfit with missing shape
2012-12-12 12:06:24 -05:00
Brad Payne (Vir Linden)
8657da24cd
SH-3604 WIP - added base outfit link creation to retryable copy/link operations. Resolves race condition with cof version and server texture bakes
2012-12-11 18:21:09 -05:00
Brad Payne (Vir Linden)
0777f53e2f
SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents
2012-12-10 14:47:17 -05:00
Brad Payne (Vir Linden)
b75e632613
SH-3606 WIP - moving classes to more reusable location
2012-12-07 13:57:44 -05:00
Brad Payne (Vir Linden)
1d5b98929b
SH-3604 FIX - switched link creation in updateCOF() to use retry path, better stats reporting, fixed failure logic
2012-12-06 15:17:00 -05:00
Brad Payne (Vir Linden)
bfa3bc0059
Possible fix for TC build failure
2012-12-05 17:58:35 -05:00
Brad Payne (Vir Linden)
480569677c
SH-3604 WIP - retry mechanism for batch inventory ops, handle either completion or failure
2012-12-05 16:38:21 -05:00
Brad Payne (Vir Linden)
6735d40d9a
SH-3604 WIP
2012-12-04 17:45:01 -05:00
Brad Payne (Vir Linden)
3be13024c5
merge
2012-12-03 14:35:45 -05:00
Brad Payne (Vir Linden)
5c245e941a
SH-3562 WIP
2012-12-03 14:34:00 -05:00
Brad Payne (Vir Linden)
9934cd2e29
SH-3562 WIP - detect possible hangs in item copying
2012-11-30 17:41:07 -05:00
Brad Payne (Vir Linden)
47a2a2982d
fix for possible crash on exit in self_av_string()
2012-11-29 11:06:10 -05:00
prep
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -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
Logan Dethrow
81219ad03b
Moved implementation of incrementCofVersion to llappearancemgr.cpp. Changed retry logic to use the more robust mRetryPolicy instead of my own previous implementation.
2012-11-19 16:30:14 -05:00
William Todd Stinson
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
William Todd Stinson
c4eaaa3d6a
CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode.
2012-11-08 12:35:15 -08:00
Brad Payne (Vir Linden)
6d085486bd
small logging tweak
2012-11-05 17:36:56 -05:00
Brad Payne (Vir Linden)
9dd856e37e
SH-3429 WIP - Added adaptive retry mechanism for failed appearance update requests
2012-11-02 18:07:07 -04:00
Brad Payne (Vir Linden)
d4dc41dbd5
misc error detection, debug coloration for avatar meshes
2012-11-01 14:19:00 -04:00
Brad Payne (Vir Linden)
3aeff074cf
SH-3469 FIX - use callback mechanism to handle possible race between getting caps and setting agent region
2012-10-26 18:27:08 -04:00
Brad Payne (Vir Linden)
878eb2b61a
audited uses of centralBakeVersion vs. isUsingServerBakes
2012-09-27 17:46:19 -04:00
Nyx (Neal Orman)
f1d6052e36
SH-3264 Moved over a few more items to llappearance
...
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
Oz Linden
be210914f4
merge changes for DRTVWR-238
2012-11-13 11:57:14 -05:00
Don Kjer
403d1b6404
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
2012-09-03 20:12:47 +00:00
Don Kjer
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
Brad Payne (Vir Linden)
825cc78732
log appearance update requests and results
2012-08-30 17:36:03 -04:00
Brad Payne (Vir Linden)
6e2739b76c
SH-3625 - some associated cleanup, do_update field is useless in various calls because of possible race conditions
2012-08-22 16:16:54 -04:00
Brad Payne (Vir Linden)
01a229ecdf
SH-3625 WIP - consolidated a couple of attachment removal paths
2012-08-22 15:27:34 -04:00
Brad Payne (Vir Linden)
40df1bba97
SH-3625 WIP - consolidating code paths for removal, removed dead code
2012-08-21 17:58:26 -04:00
Brad Payne (Vir Linden)
b232919c0a
SH-3625 WIP - consolidating code paths for wearable/attachment removal
2012-08-21 17:03:42 -04:00
Brad Payne (Vir Linden)
2db20dd01b
SH-3625 WIP - removeItem(s)FromAvatar use updateAppearanceFromCOF. Some but not all remove code goes through these.
2012-08-20 18:11:07 -04:00
Brad Payne (Vir Linden)
73dbcc10c5
requestServerAppearanceUpdate bails out if corresponding cap is null
2012-08-15 14:28:05 -04:00
Nyx (Neal Orman)
48b7eff758
Automated merge with https://bitbucket.org/VirLinden/sunshine
2012-08-14 17:13:46 -04:00
Nyx (Neal Orman)
e7a63cb356
SH-3310 WIP setting up architecture for switching texture baking on per-region basis
...
Set up an architecture to minimize the use of the baked texture debug setting.
Instead concentrating on setting a per-region flag at the region handshake point.
This should be processed once the new regions are using the updated handshake.
The debug setting is being used in this one location as a placeholder.
Builds, but not fully tested/commented yet, passing this work off to Vir.
2012-08-14 17:12:01 -04:00
Brad Payne (Vir Linden)
6ae4802e6d
merge
2012-07-30 19:10:46 -04: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
Brad Payne (Vir Linden)
409be9dcc4
SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates
2012-07-13 16:59:57 -04:00
Brad Payne (Vir Linden)
27c7b259b4
SH-3267 WIP
2012-07-12 18:24:23 -04:00
Brad Payne (Vir Linden)
6681b47d4f
SH-3267 WIP
2012-07-12 11:09:27 -04:00
Nyx (Neal Orman)
4718ffebc1
FIX: renamed UpdateAgentAppearance to UpdateAvatarAppearance
2012-07-02 18:17:56 -04:00
Brad Payne (Vir Linden)
fe01e64f97
SH-3226 WIP - request appearance update request, connects to UpdateAgentAppearance cap, in updateAppearanceFromCOF()
2012-06-29 13:08:00 -04:00
Brad Payne (Vir Linden)
99c1c64aa4
SH-3172 WIP - fix
2012-06-26 16:05:03 -04:00
Brad Payne (Vir Linden)
c3488d1fc6
SH-3172 WIP - useServerTextureBaking() func
2012-06-25 13:50:39 -04:00
callum
fd4708c2c4
MAINT-1150 FIX (Speculative) crash on (shutdown) in LLVOAvatar::avString()
...
Reviewed by vir
2012-06-20 13:37:38 -07:00
Nicky
d1e924a71e
Crashfix: During cleanup gAgentAvatarp can already be 0.
2012-07-07 22:10:43 +02: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
Brad Payne (Vir Linden)
681c5de92b
SH-3128 FIX - log message cleanup for avatar rezzing
2012-05-02 16:48:09 -04:00
Brad Payne (Vir Linden)
2c0774302b
tracking for copy-to-wear inventory failures
2012-04-26 13:18:06 -04:00
Brad Payne (Vir Linden)
1253c11e0b
more phase tracking for inventory ops
2012-04-23 11:38:53 -04:00
Brad Payne (Vir Linden)
131fb9219e
SH-3044 FIX - change avatar log message to LL_DEBUGS to allow effective toggling when default is INFO
2012-03-16 10:55:42 -04:00
Brad Payne (Vir Linden)
3f4bca6887
SH-3044 - tag avatar log messages LL_INFOS(Avatar)
2012-03-16 10:31:15 -04:00
Brad Payne (Vir Linden)
ee758c1da0
SH-2970 WIP - scoped phase tweaking, removed auto-phase-stop on metrics send
2012-03-12 18:55:30 -04:00
Brad Payne (Vir Linden)
7bc698cbec
SH-2970 WIP - more phase tracking
2012-03-08 17:07:23 -05:00
Brad Payne (Vir Linden)
80e64f26a1
via richard - fix to keep texture debug console anchored at the top
2012-03-06 15:30:08 -05:00
Brad Payne (Vir Linden)
2ac6aaf760
merge
2012-02-22 10:24:23 -05:00
Brad Payne (Vir Linden)
04caf8c876
SH-2689 WIP - move first_fully_visible static into avatar class, bake-related logging
2012-02-21 17:40:40 -05:00
Brad Payne (Vir Linden)
89752e7649
SH-2968 WIP - more logging
2012-02-17 16:38:08 -05:00
Brad Payne (Vir Linden)
4e081c9689
SH-2968 WIP - log avatar name in more places
2012-02-17 13:43:28 -05:00
Vadim ProductEngine
36aba26615
EXP-1843 WIP Added an option to output avatar rez timing.
...
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
Richard Linden
62d9db2f21
Automated merge with http://hg.secondlife.com/viewer-development
2011-10-15 18:14:23 -07:00
Aaron Stone
cddc9e58dd
EXP-625 Speed up initial outfit copy and avatar bake by moving initial gesture copy to LLAppearangeMgr::onFirstFullyVisible().
2011-10-12 17:36:03 -07:00
Paul ProductEngine
9d3fc5d930
EXP-1209 FIXED Sidetray removed.
...
- Removed all sidetray dependencies and the sidetray itself.
- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine
3c8b0ab537
EXP-1226 FIXED (Create and register a floater for Appearance side tab)
...
- Added xml for a new floater Appearance and registred it in the floaterreg
- Removed side tray dependencies
- Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-27 22:06:56 +03:00
Leslie Linden
1c57963673
Removed windows line endings to conform to coding policy.
2011-09-12 11:30:24 -07:00
Richard Nelson
d10a004432
EXP-1162 FIX We are failing to create the Outfit links from the library initial outfits copied on first login
...
reviewed by Stone
2011-08-26 14:28:50 -07:00
Dave Parks
a25f898703
merge
2011-05-02 14:52:12 -05:00
Leyla Farazha
2411a107e7
EXP-628 Inventory floater may be opened by SLApp
...
EXP-630 My appearance floater may be opened by SLApp
EXP-633 Search floater can be opened by SLApps
2011-04-18 14:22:23 -07:00
Leyla Farazha
e3c5d6d553
SOCIAL-635 Hitting enter in viewer after selecting an avatar change causes another avatar change to be initiated
2011-03-08 17:17:26 -08:00
Loren Shih
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
Loren Shih
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
Vadim ProductEngine
05c14aa558
STORM-702 FIXED Made it possible to wear partial outfits
...
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2011-01-04 13:52:29 +02:00
Loren Shih
e0d77c277a
Automated merge from mesh-development
2010-12-21 10:38:08 -05:00
Brad Payne (Vir Linden)
4bd6edc6b0
SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved onIdle functions to llcallbacklist.
2010-12-20 17:11:34 -05:00
Richard Linden
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
Seth ProductEngine
024e5ff235
STORM-559 FIXED crash upon quitting the viewer while an outfit is being saved.
2010-11-09 00:55:44 +02:00
Seth ProductEngine
8a4b7c85c2
STORM-184 FIXED Disabled "Save" command for outfits without name (with "No Outfit" in My Appearance SP).
2010-10-29 22:31:21 +03:00
callum
a0e3c4380d
EXP-271 FIX Implement slapp functionality for changing avatars
2010-10-21 16:55:15 -07:00
Loren Shih
0440fe4dcc
VWR-22695 FIXED Adding attachments messaging is inefficient
...
Single attachment request are now batched up and sent all at once as a single message.
2010-09-01 12:02:48 -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
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Tofu Linden
b5a8534116
(final?) hairy merge from viewer-release to viewer-public
2010-08-17 11:41:12 -07:00
Brad Payne (Vir Linden)
d77c3e3600
merge
2010-08-13 14:39:04 -04:00
Loren Shih
f369ebec24
EXT-8650 Can wear multiple copies of no-copy item via object links
...
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr
Removed unused mRegisteredAttachments. Not sure what this was used for, but it's no longer used.
2010-08-13 11:26:22 -04:00
Loren Shih
5881252ab2
EXT-8650 Can wear multiple copies of no-copy item via object links
...
* EXT-8688 Automatically detach same object is detected
* EXT-8689 Cleanup detachAttachmentIntoInventory code
When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13 11:12:51 -04:00
Tofu Linden
7f08555143
merge from viewer-release
2010-08-13 12:40:45 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Brad Payne (Vir Linden)
6c1796c105
DEV-52580 WIP: disallow multiple links to the same attachment in updateAppearanceFromCOF()
2010-08-12 11:00:39 -04:00
Vadim Savchuk
5de5510f58
EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are subsets of the current outfit.
...
We allowed wearing any outfit that contains non-worn items.
Now it appears to be wrong, therefore and I changed condition so that
we allow wearing any outfit (or folder) that contains the full set of body parts.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/855/
--HG--
branch : product-engine
2010-08-12 16:13:48 +03:00
Vadim Savchuk
62466c0704
EXT-8577 WIP Context menu items for multi-attachments.
...
Done:
- 1. Dropped the obsolete "MultipleAttachments" setting.
- 2. Added an "Add" item to the following attachment-related context menus:
* My Appearance (ex-My Outfits) context menu.
* Edit Outfit -> Add More context menu.
* Object in-world context menu.
* Inventory context menu.
* Object inspector gear menu.
- 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action.
TODO:
- Ability to attach multiple objects at once from the Add More panel (bulk attach).
- Make sure there's no memleak when you click Wear/Attach in the in-world object context menu
and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).
Issues:
0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments()
should replace attachments or add them. Assumed the former.
1. I couldn't verify that adding objects from the object inspector menu works
because I either could wear an object or see its inspector, not both.
2. > 1. Right-click on an object in your inventory and select "Wear".
> VERIFY: Attaches the object and replaces whatever's there; asks for
> confirmation before replacing an existing object.
I think this is impossible to implement because we don't know in advance
what point the object will be attached to, so we can't display a confirmation dialog.
Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/
--HG--
branch : product-engine
2010-08-06 17:14:01 +03:00
Tofu Linden
4e966c1b15
merge from viewer-release
2010-08-04 12:21:34 +01:00
Vadim Savchuk
4b00b98844
EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits consisting of body parts only.
...
Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu.
They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables.
By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/
--HG--
branch : product-engine
2010-08-03 23:28:51 +03:00
Christian Goetze (CG)
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
Kent Quirk
19c0d6d4ea
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
2010-07-30 10:11:55 -04:00
Richard Linden
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
Vadim Savchuk
7598015945
EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().
...
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.
Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/
--HG--
branch : product-engine
2010-07-27 22:34:34 +03:00
Tofu Linden
fe91462d62
merge from PE's viewer-release
2010-07-26 10:07:35 +01:00