ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,026 Commits 5 Branches 89 Tags
ca4e6d9b5b408d31d5778578cf41d1c77198287f
Commit Graph

3026 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
5786521103 Move max teleport distance check down into etm.DoTeleport() since this should apply to all teleport calls, not just those through Teleport() 2012-05-01 18:38:46 +01:00
Justin Clark-Casey (justincc)
37dd174697 refactor: Split most of EntityTransferModule.Teleport() into its same region and different region teleport components. 
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
 2012-05-01 17:52:30 +01:00
Melanie
ad12b5df49 Merge branch 'master' into careminster 2012-04-29 02:23:54 +01:00
Justin Clark-Casey (justincc)
2bad430ed8 Put scene object related console commands into new "Objects" help category rather than "Regions" 2012-04-28 00:08:04 +01:00
Justin Clark-Casey (justincc)
d25469f66e Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands 2012-04-27 23:38:25 +01:00
Melanie
dcbcbd697f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
 2012-04-27 22:28:09 +01:00
Oren Hurvitz
9622e8ac72 If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region. 2012-04-27 20:22:35 +01:00
Oren Hurvitz
37d770f814 Use DotNetZip to compress OARs and IARs. 
DotNetZip provides much better compression than standard .NET.
 2012-04-27 19:46:31 +01:00
Diva Canto
9bc94c502a MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid 2012-04-27 11:05:40 -07:00
Diva Canto
2970a18e54 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-27 09:26:14 -07:00
Diva Canto
c84f63f4dc Minor change in error message (HG teleport failures) 2012-04-27 09:24:50 -07:00
Melanie
90305001de Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-04-27 17:09:49 +01:00
Justin Clark-Casey (justincc)
07e62df558 Add regression test for teleporting an agent between separated regions on 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.
 2012-04-27 00:58:54 +01:00
Oren Hurvitz
ee13d817f1 When creating an OAR, objects where the user is the Creator are always 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.
 2012-04-26 22:41:31 +01:00
Justin Clark-Casey (justincc)
cb6791fb30 Tweak log messages on local region to region teleport path to help with problem resolution. 2012-04-26 22:35:25 +01:00
Melanie
88c9fdfa3a Adapt some TeleportWithMomentum calls 2012-04-25 18:36:29 +01:00
Melanie
916e372382 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-04-25 16:49:07 +01:00
Diva Canto
7aa25c6762 Slight rewording of output messages. 2012-04-24 22:40:07 -07:00
Diva Canto
fd281ded3f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-24 22:17:52 -07:00
Diva Canto
cf1c34605b HG: Moved User-level code down to the HGEntityTransferModule where it belongs. 2012-04-24 22:17:10 -07:00
Justin Clark-Casey (justincc)
af86e2939c zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment) 2012-04-25 03:47:26 +01:00
Melanie
9a23501824 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-04-25 02:33:39 +01:00
Justin Clark-Casey (justincc)
a65ca24701 Add regression test TestSameRegionTeleport() 2012-04-25 01:51:40 +01:00
Melanie
def65cd94a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-04-25 01:22:09 +01:00
Justin Clark-Casey (justincc)
6b299a4287 Comment out some debug ATTACHMENTS log messages for now. 2012-04-25 00:52:33 +01:00
Justin Clark-Casey (justincc)
39a6d7cab4 Comment out the noisier AVFACTORY log messages for now. 
Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
 2012-04-25 00:47:32 +01:00
Justin Clark-Casey (justincc)
0f470326aa Improve teleport log debug and error messages to tell us who is teleporting. 2012-04-25 00:19:38 +01:00
Oren Hurvitz
2f398231ac Minor improvements to logging 
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
 2012-04-24 21:38:09 +01:00
Melanie
c5520dc83f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-24 21:30:12 +01:00
Diva Canto
fd27988978 Changed the Map-related messages from Info to Debug. They're debug messages. 2012-04-23 21:29:18 -07:00
Melanie
e903709847 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-04-23 20:44:41 +01:00
Talun
679da63da6 Mantis 5977 Corrections to llRegionSayTo 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-04-23 07:16:33 -04:00
Justin Clark-Casey (justincc)
8205fe79ce Fix bug where setting phantom on a prim would result in a server log message 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.
 2012-04-22 19:51:51 +01:00
Justin Clark-Casey (justincc)
c8307cdf1e Improve bitmap disposal to do null checks and not to potentially try 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
 2012-04-20 23:35:11 +01:00
Melanie
464fb2533f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
	OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
 2012-04-20 16:48:43 +01:00
Justin Clark-Casey (justincc)
75f117484b Always dispose of existing opened bitmap from file in SaveFile(), instead of simply dropping the reference if the existing file didn't contain a bitmap of the same size. 2012-04-20 03:57:22 +01:00
Justin Clark-Casey (justincc)
cba64ebc79 Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and JPEG.cs 2012-04-20 03:46:33 +01:00
Garmin Kawaguichi
63cda3a6d0 concerns GenericSystemDrawing.cs 
in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs
Ln 67
Apply Justin's solution

Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
 2012-04-20 03:26:02 +01:00
Justin Clark-Casey (justincc)
2b98e2f106 Stop teleports from dropping tall avatars through or embedding them in the 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
 2012-04-20 02:50:36 +01:00
Melanie
65b3e13010 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-20 00:17:14 +01:00
Melanie
525b7593e8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-04-18 20:09:52 +01:00
Justin Clark-Casey (justincc)
c85f9d681a On "show part" command, show link number. 
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.
 2012-04-18 00:39:39 +01:00
Melanie
0fe0b2ceec Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death) 2012-04-17 23:39:41 +02:00
Melanie
74aa8eee12 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-17 01:54:54 +01:00
Justin Clark-Casey (justincc)
24a0cc5261 refactor: Rename EstateSettings.IsEstateManager() to 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.
 2012-04-17 01:25:41 +01:00
Melanie
919972a440 Merge branch 'master' into careminster 
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
 2012-04-14 01:51:20 +01:00
Kevin Cozens
a366c05ae2 Added ability to exclude inventory items or folders when saving IAR files. 2012-04-13 23:31:12 +01:00
Melanie
4a67e8b98f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs
 2012-04-11 23:35:27 +01:00
Snoopy Pfeffer
8be14095fe HGFriendsModule: Type casts to fix compile error 2012-04-11 18:56:28 +02:00
Snoopy Pfeffer
1f4d3d3582 HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users. 2012-04-11 18:52:07 +02:00