aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Allow cross-scope friendships to work, and also allow other cross scope nameMelanie2011-01-032-2/+2
| | | | resolution
* Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
| | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere
* uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
|
* minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵Justin Clark-Casey (justincc)2010-12-181-3/+3
| | | | console command isn't valid
* Raise maximum iar version that master can load to 1.x, so that it can load ↵Justin Clark-Casey (justincc)2010-12-181-1/+1
| | | | its own iars (oops)
* reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵Justin Clark-Casey (justincc)2010-12-141-0/+16
| | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
* Remove the restriction that you have to be logged in when loading/saving iarsJustin Clark-Casey (justincc)2010-12-112-72/+70
| | | | This is pointless as we're supplying the password on the command line
* If we're saving an IAR with --profile information, then label this a version ↵Justin Clark-Casey (justincc)2010-12-111-5/+22
| | | | 1.0 IAR since it isn't compatible with older OpenSim releases.
* Fixed wrong commentDiva Canto2010-12-081-1/+1
|
* Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵Diva Canto2010-12-081-1/+1
| | | | yet...
* Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-081-42/+202
| | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-055-101/+145
|\
| * Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-031-36/+63
| | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-291-24/+6
| |\
| | * Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-271-24/+6
| | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes.
| * | Fix unit test.Diva Canto2010-11-293-9/+16
| | |
| * | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-294-35/+63
| |/ | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-55/+50
|\ \ | |/
| * Only perform the take object permissions check if an object is being ↵Justin Clark-Casey (justincc)2010-11-231-55/+50
| | | | | | | | attached directly from the scene, not from existing inventory
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-213-77/+94
|\ \ | |/
| * Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-211-2/+8
| | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
| * Fixed appearance send for avatars with only default textures. This should ↵Master ScienceSim2010-11-181-53/+74
| | | | | | | | | | | | fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes. Signed-off-by: Melanie <melanie@t-data.com>
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-22/+12
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-36/+39
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Formatting cleanup.Jeff Ames2010-11-082-33/+32
| |
| * Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
| |
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-5/+10
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-5/+10
| | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-32/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-301-10/+5
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-29/+18
| | |\
| | * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
| * | | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | |/ | |/|
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-29/+18
|\ \ \ | |/ /
| * | Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-291-29/+18
| |/ | | | | | | commenting out most of them as per Mic
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-43/+62
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-43/+62
| | | | | | | | | | and avatar data are sent. And the number of times they are stored.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-101/+286
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| |
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-283-14/+83
| |\
| | * Formatting cleanup.Jeff Ames2010-10-273-7/+7
| | |
| | * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+3
| |/ |/| | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| * Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| | | | | | | | a bigger clean up that needs to happen around locks on appearance.
| * Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-251-1/+1
| | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake.
| * Major refactoring of appearance handling.Master ScienceSim2010-10-202-95/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
* | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-221-3/+3
|\ \
| * \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-17/+65
| |\ \ | | |/
| * | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-0/+329
| |\ \
| * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-3/+3
| |\ \ \