aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination'Melanie2012-05-021-0/+7
|\
| * Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+7
| | | | | | | | work right, finally.
* | Merge branch 'master' into careminsterMelanie2012-04-291-9/+15
|\ \
| * | Put scene object related console commands into new "Objects" help category ↵Justin Clark-Casey (justincc)2012-04-281-9/+13
| | | | | | | | | | | | rather than "Regions"
| * | Add flags information (phantom, physics, etc.) to "show object" and "show ↵Justin Clark-Casey (justincc)2012-04-271-0/+2
| | | | | | | | | | | | part" console commands
* | | Merge branch 'master' into careminsterMelanie2012-04-276-15/+49
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-272-9/+28
| | | | | | | | | | | | affect the starting position in the destination region.
| * | Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-272-2/+8
| | | | | | | | | | | | DotNetZip provides much better compression than standard .NET.
| * | MapImageService: changed the event at which the map tiles are uploaded, ↵Diva Canto2012-04-271-3/+12
| | | | | | | | | | | | because they were being uploaded before the region was registered with the grid
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-2716-47/+71
| |\ \
| * | | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-2716-46/+66
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-2713-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * | | When creating an OAR, objects where the user is the Creator are always ↵Oren Hurvitz2012-04-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | included, regardless of their permissions. The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
| * | | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-263-23/+41
| |/ / | | | | | | | | | problem resolution.
* | | Adapt some TeleportWithMomentum callsMelanie2012-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-252-14/+15
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-241-0/+1
| |\ \
| | * | zero out SP velocity before calling SP.Teleport(), as the client expects ↵Justin Clark-Casey (justincc)2012-04-251-0/+1
| | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment)
| * | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-04-251-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-253-28/+43
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Comment out some debug ATTACHMENTS log messages for now.Justin Clark-Casey (justincc)2012-04-251-15/+14
| | |
| * | Comment out the noisier AVFACTORY log messages for now.Justin Clark-Casey (justincc)2012-04-251-4/+6
| | | | | | | | | | | | Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
| * | Improve teleport log debug and error messages to tell us who is teleporting.Justin Clark-Casey (justincc)2012-04-251-3/+14
| | |
| * | Minor improvements to loggingOren Hurvitz2012-04-242-6/+9
| | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* | | Merge branch 'master' into careminsterMelanie2012-04-243-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Changed the Map-related messages from Info to Debug. They're debug messages.Diva Canto2012-04-234-8/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-233-54/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-232-52/+70
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
| * | Improve bitmap disposal to do null checks and not to potentially try ↵Justin Clark-Casey (justincc)2012-04-201-4/+7
| | | | | | | | | | | | | | | | | | | | | disposal of uninitialized variables. This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail. Resolves http://opensimulator.org/mantis/view.php?id=5973
* | | Merge branch 'master' into careminsterMelanie2012-04-203-46/+84
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * | Always dispose of existing opened bitmap from file in SaveFile(), instead of ↵Justin Clark-Casey (justincc)2012-04-201-22/+37
| | | | | | | | | | | | simply dropping the reference if the existing file didn't contain a bitmap of the same size.
| * | Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and ↵Justin Clark-Casey (justincc)2012-04-202-18/+31
| | | | | | | | | | | | JPEG.cs
| * | concerns GenericSystemDrawing.csGarmin Kawaguichi2012-04-201-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs Ln 67 Apply Justin's solution Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
| * | Stop teleports from dropping tall avatars through or embedding them in the ↵Justin Clark-Casey (justincc)2012-04-201-1/+7
| | | | | | | | | | | | | | | | | | | | | floor when lured by short avatars. This involves giving the ceiling of the Z-component in a lure rather than the floor. Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-201-0/+2
|\ \ \ | | |/ | |/| | | | careminster
| * | Prevent objects rezzed in sim from being seen as attachments and becoming ↵Melanie2012-04-171-0/+2
| | | | | | | | | | | | uneditable or crashers. (Foxtail of death)
* | | Merge branch 'master' into careminsterMelanie2012-04-181-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | On "show part" command, show link number.Justin Clark-Casey (justincc)2012-04-181-1/+1
| | | | | | | | | | | | | | | This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root). This information is still avaliable on the "show object" command.
* | | Merge branch 'master' into careminsterMelanie2012-04-173-4/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-173-4/+4
| | | | | | | | | | | | | | | | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
* | | Merge branch 'master' into careminsterMelanie2012-04-142-82/+129
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-114-4/+64
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * HGFriendsModule: Type casts to fix compile errorSnoopy Pfeffer2012-04-111-1/+1
| |
| * HGFriendsModule: Added optional user level based restriction to send ↵Snoopy Pfeffer2012-04-111-4/+20
| | | | | | | | friendship invitations to foreign users.
generated by cgit v1.1 at 2025-01-09 00:06:26 +0000