aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-234-6/+33
| | | | | | | | | | | | | | | | | | | | | llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
| * | minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-5/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-191-1/+15
|\ \ \ | |/ /
| * | Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)2012-05-191-1/+15
| | | | | | | | | | | | | | | | | | saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
* | | Merge branch 'master' into careminsterMelanie2012-05-194-25/+99
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵Justin Clark-Casey (justincc)2012-05-191-8/+2
| | | | | | | | | | | | | | | | | | more than one megaregion in a simulator, separated by water. Rename IsRootRegion() to IsRootForMegaregion()
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-192-8/+6
| |\ \
| | * | Further refinement on propertiesBlueWall2012-05-181-7/+4
| | | |
| | * | Cleanup + change properties to set fields with private set : Thanks Justin ↵BlueWall2012-05-182-3/+4
| | | | | | | | | | | | | | | | for the tip.
| * | | Add is_megaregion flag into oar control file. Not currently read - for ↵Justin Clark-Casey (justincc)2012-05-191-0/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | future use. Please do not rely on this remaining here. An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975, thanks! Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data). This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
| * | Provide Telehub setting to allow use of landmarksBlueWall2012-05-182-1/+9
| | | | | | | | | | | | Setting to allow use of landmarks to override telehub routing. Default is off.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-171-29/+28
| |\ \
| * | | Check agent limit against root agent count rather than both root and child ↵Justin Clark-Casey (justincc)2012-05-173-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | agents From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115 agent should apply to avatars only. This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources. As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate. This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed. This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
* | | | Merge branch 'avination' into careminsterMelanie2012-05-173-6/+314
|\ \ \ \ | | |_|/ | |/| |
| * | | trigger collision sounds on active agent position for better spatial effect ↵UbitUmarov2012-05-172-23/+22
| | | | | | | | | | | | | | | | without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
| * | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ↵UbitUmarov2012-05-172-2/+2
| | | | | | | | | | | | | | | | volumedetect collision
| * | | add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| | | |
| * | | default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| | | |
| * | | default collision sounds. Incomplete, untested, needs revisionUbitUmarov2012-05-172-1/+205
| | | |
| * | | collision sounds: simplify send code a bit and limit sending rate to 5 per ↵UbitUmarov2012-05-161-1/+36
| | | | | | | | | | | | | | | | sec per part ???
| * | | Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵UbitUmarov2012-05-161-4/+13
| | | | | | | | | | | | | | | | sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
* | | | Merge branch 'master' into careminsterMelanie2012-05-172-29/+171
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-05-171-29/+28
| |\ \ \ | | |_|/ | |/| |
| | * | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| | | |
| * | | minor: improve method doc for ↵Justin Clark-Casey (justincc)2012-05-171-1/+1
| | | | | | | | | | | | | | | | TestSameSimulatorSeparatedRegionsCreateAgentFails()
| * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵Justin Clark-Casey (justincc)2012-05-171-2/+2
| | | | | | | | | | | | test logging accidentally left in
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-171-0/+76
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-163-114/+16
|\ \ \ | |/ /
| * | Route OAR SOG loading through the common ↵Justin Clark-Casey (justincc)2012-05-162-113/+4
| | | | | | | | | | | | | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG().
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-153-512/+191
| |\ \
| * | | Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-151-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
* | | | Merge branch 'avination' into careminsterMelanie2012-05-151-50/+124
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be ↵UbitUmarov2012-05-151-2/+5
| | | | | | | | | | | | | | | | coerent with other places in case of future changes. Should be equivalent if all is well.
| * | | sop colisions don't play sounds on volume detectorsUbitUmarov2012-05-151-1/+1
| | | |
| * | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator ↵UbitUmarov2012-05-151-48/+118
| | | | | | | | | | | | | | | | collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing)
| * | | Port the mel/dahlia fixMelanie2012-05-151-0/+3
| | | |
| * | | don't send colision events to volume detectorsUbitUmarov2012-05-151-1/+2
| | | |
| * | | Fix an omissionMelanie2012-05-151-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| | | | | | | | | | | | | | | | loads roots before children like MySQL does.
| * | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| | | |
| * | | Port Avination's collision fixes to core.Melanie2012-05-153-512/+188
| | |/ | |/|
* | | Merge branch 'avination' into careminsterMelanie2012-05-144-514/+184
|\ \ \ | | |/ | |/|
| * | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-143-512/+178
| | |
| * | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| | |
| * | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-142-38/+147
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| | |
| * | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2025-01-08 21:34:44 +0000