aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-074-8/+39
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-12-063-7/+38
| |\
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0511-178/+438
| | |\
| | * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-232-1/+2
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-215-3/+123
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-214-48/+47
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-056-4/+46
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-16/+58
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-4/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-305-319/+151
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-23/+16
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-19/+116
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-298-546/+695
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'careminster-presence-refactor' of ↵sacha2010-12-042-6/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | | | | | | | | | | | | add more detail to the log in case of FORM Timeoutsacha2010-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause nothing relevant are in the services logs
* | | | | | | | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iteratingMelanie2010-12-061-35/+59
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-042-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-032-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-035-137/+380
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | | | | | | | | | Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-0/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-30/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix unit test.Diva Canto2010-11-291-0/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-295-113/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * | | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility ↵Diva Canto2010-11-272-30/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions around.
* | | | | | | | | | | | | | Various bug fixes for appearance handlingMic Bowman2010-11-302-5/+22
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-271-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-272-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 handling of landmarks for systems with culture settings other than ↵Marck2010-11-261-2/+10
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | en_US. This fixes Mantis #5177.
* | | | | | | | | | | | | | Instrument TI Dictionary to finally find that pesky script-caused deadlockMelanie2010-11-271-3/+33
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Prevent an overlength button label from producing a debug dump and abortingMelanie2010-11-242-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the script.
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Initialize InventoryItemBase.creatorData properly. Could throw.Diva Canto2010-11-231-1/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-222-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-0/+106
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-212-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-182-3/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | small refactor: reuse existing commandLine string rather than calling ↵Justin Clark-Casey (justincc)2010-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmdline.ToString() again
| * | | | | | | | | | save all lines to history, not just those which turn out to be valid ↵Justin Clark-Casey (justincc)2010-11-171-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comands. does not store passwords also, blank lines are not stored to history this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
| * | | | | | | | | | minor: add some method commentsJustin Clark-Casey (justincc)2010-11-171-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into careminster-presence-refactorMelanie2010-11-094-48/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Formatting cleanup.Jeff Ames2010-11-084-48/+47
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
| | | | | | | | |
* | | | | | | | | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
| | | | | | | | |
generated by cgit v1.1 at 2024-12-25 19:55:55 +0000