ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 12:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,064 Commits 5 Branches 93 Tags
be60c0b0105e2d6929bb331ff86dfbcc45261221
Commit Graph

1206 Commits

Author SHA1 Message Date
UbitUmarov
a285ff7e69 check land permitions on sit target for unscripted sits 2013-01-03 14:27:21 +00:00
Melanie
ae8733bf59 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-23 03:39:49 +00:00
Justin Clark-Casey (justincc)
36c6edac69 Remove the redundant BypassPermissions() checks in EstateManagmentModule. 
This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
 2012-11-23 03:29:50 +00:00
Justin Clark-Casey (justincc)
9b60c14bb1 minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer. 2012-11-23 03:05:30 +00:00
Melanie
5895c4cc6f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc)
df4da51f04 Following on from 4f982596, launch map name requests on an async thread from LLClientView directly. 
This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
 2012-11-15 03:04:46 +00:00
Melanie
556d70feef Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2012-11-13 17:37:39 +00:00
Diva Canto
457395d9c1 Another 11 modules' directions moved out of .addin.xml 2012-11-13 08:36:44 -08:00
Diva Canto
608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie
af01a2320a Merge branch 'master' into careminster 2012-11-13 10:49:24 +00:00
Diva Canto
d73aa8c1a6 Moved the WindModule and its own plugins out of .addin.xml 2012-11-12 21:27:23 -08:00
Diva Canto
31177d9259 Another 10 modules' directives moved from .addin.xml 2012-11-12 21:14:58 -08:00
Melanie
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-12 23:27:47 +00:00
Melanie
0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid 
grepping for remaining uses
 2012-11-12 19:18:20 +00:00
Melanie
d9b149b375 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-11-12 15:46:45 +00:00
Diva Canto
ba2318bd61 One more module converted: PermissionsModule. 2012-11-11 15:59:09 -08:00
Melanie
d84de8c9b6 Merge branch 'master' into careminster 2012-11-11 21:16:58 +00:00
PixelTomsen
37c9700904 moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 11:17:40 -08:00
Melanie
389077345f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
 2012-11-11 16:31:01 +00:00
Diva Canto
e10d61ea8c One more module converted: CloudModule. 2012-11-10 11:59:08 -08:00
Diva Canto
492515cf3f One more module converted: Vegetation. 2012-11-09 21:58:39 -08:00
Diva Canto
4f98259617 Minor improvement in the MapSearchModule. Stop blocking the client thread if the search takes too long. 2012-11-09 20:39:55 -08:00
Diva Canto
2540132a54 MapSearchModule also converted to new region module interface (37 to go). 2012-11-09 16:40:55 -08:00
Diva Canto
19aab3e6fe Converted the WindModule to the new region module interface (38 to go). Also added both the WindModule and the SunModule to the Plugin manifest. 2012-11-09 16:28:30 -08:00
Diva Canto
7dfd1468cc Converted the SunModule to the new region module interface. (39 to go...) 2012-11-09 15:38:10 -08:00
Melanie
e7a6328ea4 Merge branch 'master' into careminster 2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc)
8dfe59d7b8 Comment out checks not to overwrite existing IAR/OAR files for now on "save iar/oar" since this causes problems for some backup systems. 
Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
 2012-11-01 03:42:15 +00:00
Melanie
a2c6094324 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc)
6235d16c31 Make "show object part" command correctly display script status. 
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
 2012-10-31 00:31:18 +00:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv
a09cba6da3 refactoring to use assembly:classname style of configuration 2012-10-29 23:39:01 +00:00
SignpostMarv
a16ddbee41 Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless. 2012-10-29 23:39:01 +00:00
SignpostMarv
e308841de9 SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.StopSound rather than setting gain to zero 2012-10-29 23:39:01 +00:00
SignpostMarv
e0b5a3cd90 tweaking configuration logic so that the INonSharedRegionModule will load by default 2012-10-29 23:39:01 +00:00
SignpostMarv
a9999a9676 Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint 2012-10-29 23:39:01 +00:00
SignpostMarv
c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv
5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
SignpostMarv
e75596524a Formatting SoundModuleNonShared.LoopSound, consistent indentation 2012-10-29 23:38:59 +00:00
SignpostMarv
9df510157e deduplicating code into a single LoopSound method 2012-10-29 23:38:59 +00:00
SignpostMarv
3d8f59aac3 refactoring StopSound into a private static method to skip repeating m_scene.TryGetSceneObjectPart 2012-10-29 23:38:59 +00:00
SignpostMarv
e5df8cafb8 Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the SL Wiki spec does not state that slaves are set to match master values 2012-10-29 23:38:59 +00:00
SignpostMarv
d7ffcace8f adjusting parameter order of PreloadSound to be more logical 2012-10-29 23:38:59 +00:00
SignpostMarv
29a8ae48b5 transposing LoopSoundMaster to Sound Module 2012-10-29 23:38:59 +00:00
SignpostMarv
a68e2fe169 transposing preload sound onto sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
8763a637b5 transposing stop sound into sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
6440892788 TryGetScenePresence in TriggerSound is probably meant to be using the ownerID, not the objectID 2012-10-29 23:38:57 +00:00
SignpostMarv
516ee244b4 swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound to imply why we're doing an early return. 2012-10-29 23:38:57 +00:00
SignpostMarv
1d47bcb6b6 stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs 2012-10-29 23:38:57 +00:00