aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0568-987/+2318
| | |\
| | | * Simplify updating of agent inventory assets. Make newly created asset IDsMelanie2010-12-041-19/+6
| | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time.
| | * | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2317-99/+307
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2165-1077/+1971
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-2118-111/+167
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-0530-91/+289
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-311-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | * better semantics for link-region commandJonathan Freedman2010-10-301-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * actually parse name for new link-region command
| | * | | | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-307-60/+168
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-5/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-3016-486/+342
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-299-70/+64
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-82/+270
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2941-934/+1261
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-3/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | * throw debug message when no HomeURI is setJonathan Freedman2010-10-241-0/+2
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | * a bit of additional debugging:Jonathan Freedman2010-10-232-8/+6
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵sacha2010-12-0419-295/+592
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | Cowardly refuse to keep running when no application plugins are loaded.Melanie2010-12-073-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up
* | | | | | | | | | | | | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iteratingMelanie2010-12-061-35/+59
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Add some safeguards: DOn't send someone else's HUDs, don't send deleted primsMelanie2010-12-041-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some unneccessarily wordy core comments
* | | | | | | | | | | | | | | | | | | Monitor the UUIDs used to create and update wearable assets. Reject any changedMelanie2010-12-042-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture that is not present in the user's inventory full perm. This will prevent "UUID snatching", a copybot-type of attack that can cause clothing makers to be forced to destroy and replace legit items in order to invalidate the copies.
* | | | | | | | | | | | | | | | | | | Simplify updating of agent inventory assets. Make newly created asset IDsMelanie2010-12-041-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time.
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-045-57/+235
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-12-045-57/+235
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | minor: add class doc line to older region module example code pointing ↵Justin Clark-Casey (justincc)2010-12-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | towards newer
| | * | | | | | | | | | | | | | | | | | comment out the extension attributeJustin Clark-Casey (justincc)2010-12-041-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | add bare bones shared example moduleJustin Clark-Casey (justincc)2010-12-041-0/+91
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | refactor some common code in RegionModulesControllerPluginJustin Clark-Casey (justincc)2010-12-042-61/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also some minor doc changes in BareBonesNonSharedModule
| | * | | | | | | | | | | | | | | | | | correct the id of the example moduleJustin Clark-Casey (justincc)2010-12-041-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add the most bare bones non-shared region module example. Not active unless ↵Justin Clark-Casey (justincc)2010-12-041-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct line is uncommented.
| | * | | | | | | | | | | | | | | | | | add warning decals and information to RegionModule.cs in probably ↵Justin Clark-Casey (justincc)2010-12-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-functional OpenSim.Region.Examples.SimpleModule project
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-044-62/+123
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | minor: correction to logging categoryJustin Clark-Casey (justincc)2010-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Convert the agent asset transactions module to a new style module.Melanie2010-12-044-170/+158
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to remove the property "MyScene" and the pointless circular refs to the managing classes. Converted the module to a non-shared module. Reformatted source for 80 columns. Removed the special role the module had in the old loader.
* | | | | | | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-045-24/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-045-24/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-034-62/+123
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
| | * | | | | | | | | | | | | | | | | | minor: change OpenSimBase log messages associated with newer module loader ↵Justin Clark-Casey (justincc)2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make the association clear
* | | | | | | | | | | | | | | | | | | | Convert the agent asset transactions module to a new style module.Melanie2010-12-044-170/+158
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to remove the property "MyScene" and the pointless circular refs to the managing classes. Converted the module to a non-shared module. Reformatted source for 80 columns. Removed the special role the module had in the old loader.
* | | | | | | | | | | | | | | | | | | When linking something, immediately persist the linked set.Melanie2010-12-031-0/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | | | | | | | | | | | | | | | | Fix spurious Av move when clothing item worn or removed.Kitto Flora2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix status responses in remote adminMelanie2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵Melanie2010-12-033-17/+18
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953.
* | | | | | | | | | | | | | | | | | Improve health reportingMelanie2010-12-032-11/+23
| | | | | | | | | | | | | | | | | |
generated by cgit v1.1 at 2024-10-24 18:31:10 +0000