aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Prevent objects that are worn from ground from vanishing from the sceneMelanie2010-12-121-9/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-129-125/+140
|\
| * 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.
| * Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)2010-12-113-35/+34
| | | | | | | | | | | | compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
| * Normalization of OSSL function names.Marck2010-12-101-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the following replacement functions for compliance to the OSSL standards stated on the wiki: osGetTerrainHeight osSetTerrainHeight osGetSunParam osSetSunParam osSetPenColor The functions that do not comply to the standard give a warning when used but work normally otherwise. The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour". The following two functions have been renamed because they are not enabled yet aynway: osWindParamSet => osSetWindParam osWindParamGet => osGetWindParam
| * Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵Diva Canto2010-12-091-1/+1
| | | | | | | | command. mantis #5259
| * 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...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-42/+202
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-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>.
| * | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-092-0/+34
| |/ | | | | | | whether or not an agent is allowed there as a root agent.
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-092-0/+34
| | | | | | | | whether or not an agent is allowed there as a root agent.
* | Add the interface needed to revive calling cardsMelanie2010-12-071-0/+13
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-075-52/+29
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-065-52/+29
| |\ \ | | |/
| | * Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-052-6/+6
| | | | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0518-305/+737
| | |\
| | | * 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.
| | | * Convert the agent asset transactions module to a new style module.Melanie2010-12-043-168/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master-core' into mantis5110Jonathan Freedman2010-11-232-56/+51
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2116-194/+651
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-216-52/+59
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-055-50/+78
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-311-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-5/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-303-37/+10
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-294-34/+23
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-43/+62
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-298-144/+317
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | * throw debug message when no HomeURI is setJonathan Freedman2010-10-241-0/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Cowardly refuse to keep running when no application plugins are loaded.Melanie2010-12-072-3/+21
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up
* | | | | | | | | | | | | | | 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 'careminster-presence-refactor' of ↵Melanie2010-12-041-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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.
* | | | | | | | | | | | | | | | Convert the agent asset transactions module to a new style module.Melanie2010-12-043-168/+156
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into careminster-presence-refactorMelanie2010-12-0311-64/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-292-25/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-272-25/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-297-45/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * | | | | | | | | | | | | | | Creator information preserved upon HG transfers.Diva Canto2010-11-262-8/+87
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-252-1/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Export the module interface for restartMelanie2010-11-251-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵Diva Canto2010-11-253-2/+28
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.