aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-42/+202
|\
| * 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>.
* | Add the interface needed to revive calling cardsMelanie2010-12-071-0/+13
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+3
|\ \ | |/
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-055-101/+145
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-55/+50
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-213-77/+94
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-36/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-5/+10
| |\ \ \ \ \
| * \ \ \ \ \ 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' into mantis5110Jonathan Freedman2010-10-291-29/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-43/+62
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-101/+286
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-13/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | 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' into careminster-presence-refactorMelanie2010-12-034-43/+78
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | | | | | | | 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.
* | | | | | | | | | Various bug fixes for appearance handlingMic Bowman2010-11-301-34/+59
| | | | | | | | | |
* | | | | | | | | | Change inworld restart to use blue boxes rather than notices to match SLMelanie2010-11-291-2/+2
| | | | | | | | | |
* | | | | | | | | | Implement god summonsMelanie2010-11-281-7/+21
| | | | | | | | | |
* | | | | | | | | | Convert the scope id in the im session id to a URL variable. Fixes offlineMelanie2010-11-261-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group notice attachments not working
* | | | | | | | | | Prevent an overlength button label from producing a debug dump and abortingMelanie2010-11-241-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the script.
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-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' into careminster-presence-refactorMelanie2010-11-221-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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.
* | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-181-53/+74
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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.
* | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-28/+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.
* | | | | | | | When detaching a scripted item, always consider it modified. Script statesMelanie2010-11-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will have changed and for real usability, we need to save it. It bloats assets, but that can't be avoided.
* | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-092-33/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Formatting cleanup.Jeff Ames2010-11-082-33/+32
| | | | | | | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-081-4/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix the inventory transfer module to not cause duplicated text IMsMelanie2010-11-051-3/+6
| | | | | | |
* | | | | | | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
| | | | | | |
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-66/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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' 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
| | |/ / / | |/| | |
| * | | | 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 careminster-presence-refactorMelanie2010-10-292-84/+225
|\ \ \ \ | |/ / /
| * | | 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.
| * | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| | |