aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-231-9/+6
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| |\
| | * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | | | | | constructor and never subsequent set to null.
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+4
| |/ | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-02-211-15/+14
|\ \ | |/ | | | | Conflicts:
| * Fix bug where NPCs would establish child agents on other neighbour regions ↵Justin Clark-Casey (justincc)2012-02-211-15/+14
| | | | | | | | that had come up after the NPC was created.
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-6/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-6/+6
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| | |
* | | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-3/+3
| |\ \
| * | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-181-0/+26
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| | |
| * | Propagate our teleport flags on loginsBlueWall2012-02-181-1/+4
| | |
| * | Fix missing telehub handling on loginBlueWall2012-02-171-0/+21
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-151-3/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
* | Merge branch 'master' into careminsterMelanie2012-02-031-4/+34
|\ \ | |/
| * ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-021-4/+22
| |
| * Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵Dan Lake2012-02-011-10/+12
| | | | | | | | with region heartbeats
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-011-112/+51
| |\
| * | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-191-0/+10
| | |
* | | Streamline banning code using existing methods.Melanie2012-02-021-3/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-011-6/+16
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| | |
| * | Fix copy/paste errorsMelanie2012-02-011-2/+2
| | |
| * | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-1/+11
| | | | | | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
* | | Merge branch 'master' into careminsterMelanie2012-01-311-104/+0
|\ \ \ | |/ /
| * | Move object delete commands into a commands region module, in preparation ↵Justin Clark-Casey (justincc)2012-01-311-104/+0
| | | | | | | | | | | | for adding similar show commands.
* | | Merge branch 'master' into careminsterMelanie2012-01-311-0/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | scene objects. These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature. Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc. However, data can be inconsistent due to different machine circumstances and virtual machine actions. This area is under development.
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+27
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
| | | | | | | | | | | | spawn points
* | | Add handling bans properlyMelanie2012-01-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-101-2/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| | | | | | | | | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
| * | Add some run-time debugging supportBlueWall2012-01-091-0/+3
| | | | | | | | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
| * | Use our TeleportFlagsBlueWall2012-01-091-2/+2
| |/ | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-041-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-021-13/+20
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Bug fix in map tiles in standalone: the map has been blank since commit ↵Diva Canto2011-12-301-13/+20
| | | | | | | | | | | | 01ae916bad672722aa62ee712b7b580d6f5f4370 r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4901167779f07ed3e89fb1d24ffc22a Author: Oren Hurvitz Date: 7/22/2011 This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
* | Merge branch 'master' into careminsterMelanie2011-12-221-2/+11
|\ \ | |/
| * rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵Justin Clark-Casey (justincc)2011-12-221-2/+2
| | | | | | | | external as a property
| * Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-221-0/+9
| | | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | Merge branch 'master' into careminsterMelanie2011-12-191-6/+5
|\ \ | |/
generated by cgit v1.1 at 2025-01-19 12:14:12 +0000