ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-08 21:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,155 Commits 5 Branches 97 Tags
63d1916f511fdbbec8bc111f4bf80b3e4e0bc267
Commit Graph

216 Commits

Author SHA1 Message Date
UbitUmarov
e1a5a1f829 apply objectSlamSale to all roots of coalescence objects. replace the 
single object condition for renaming
 2014-08-05 23:25:08 +01:00
UbitUmarov
3c321e5bb3 dont mess with names and descriptions on coalescence objects. Inventory 
name can change for inventory purposes only.
 2014-08-05 22:49:41 +01:00
UbitUmarov
2c4908578e revert to old avn-current code, not using ApplyPermissionsOnRez() till its 
reviewed/fixed
 2014-08-05 21:55:42 +01:00
UbitUmarov
dc717303d4 replace old Attachoffset by AttachedPos. Comented out possible merge 
artifacts
 2014-07-20 01:15:33 +01:00
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Oren Hurvitz
91fd9c4670 Refactored: use a single function to apply an object's folded permissions to its main permissions 2014-01-10 19:50:03 +00:00
Oren Hurvitz
13f31fdf85 Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory. 
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
 2014-01-10 19:37:59 +00:00
Melanie
ba203ed94f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-11-03 21:34:36 +00:00
Oren Hurvitz
d0c1780839 Fixed rezzing coalesced objects from a prim's inventory 
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
 2013-10-15 23:59:16 +01:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Diva Canto
67e500383e Put guards on a bunch of exception-inducing code, as seen in logs from load test. 2013-07-09 14:12:52 -07:00
Melanie
5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-26 03:40:06 +00:00
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01: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
4fe6d8c3a4 Merge branch 'master' into careminster 2012-10-18 23:48:35 +01:00
Justin Clark-Casey (justincc)
a960273e91 Add number of inventory items to information displayed via "show part" console command 2012-10-18 23:02:57 +01:00
Melanie
130668057f Fix merge artefacts 2012-07-17 01:42:42 +02:00
Melanie
d632fd7124 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-07-12 08:55:16 +01:00
Justin Clark-Casey (justincc)
fc24563206 Add regression TestDetachScriptedAttachmentToInventory() 
This currently only does a relatively crude check for a ScriptState node in the serialized xml
 2012-07-11 21:43:35 +01:00
Melanie
0bc8238a6c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-11 03:56:50 +01:00
Justin Clark-Casey (justincc)
f3134b5cf6 When an attachment is detached to inv or derezzed, stop the scripts, update the known item with script state still in the script engine and then remove the scripts. 
This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
 2012-07-10 22:41:11 +01:00
Melanie
5776351f6a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-05 22:17:39 +01:00
Justin Clark-Casey (justincc)
3c9b9a848f Fix issue in database tests where sogs being stored are not in a scene. 
This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
 2012-07-03 22:58:58 +01:00
Melanie
d32cf21576 Add preservation of running state of scripts when drag-copying. 2012-07-01 18:30:59 +01:00
Melanie
eab211f94d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc)
0fa303b1cf Log how many scripts are candidates for starting and how many are actually started. 
Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
 2012-06-20 00:10:19 +01:00
Melanie
67483a6e50 Remove two causes of recursive locking. Merge artefact cleanup. 2012-06-06 20:36:47 +02:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
Justin Clark-Casey (justincc)
ff53add54d refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartInventory.GetInventoryItem(string) 
Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
 2012-05-26 00:36:01 +01:00
Justin Clark-Casey (justincc)
9f1fc7ea88 Remove a call stack debugging line accidentally left in from a few days ago at SceneObjectPartInventory.ApplyNextOwnerPermissions(). 2012-05-25 02:54:37 +01:00
Justin Clark-Casey (justincc)
ff429a259b Fix bug where an avatar that had an object they owned attached through 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.
 2012-05-23 01:58:10 +01:00
Melanie
31ab8b2fe0 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
01b00ad0d5 Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed. 
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
 2012-05-05 00:29:14 +01:00
Melanie
e6e12c2d42 Merge branch 'avination' 2012-05-02 00:32:28 +02:00
Melanie
98e9f22544 Preserve attachment rotation on objects rezzed via a script. Makes toasters 
work right, finally.
 2012-05-02 00:29:56 +02:00
Melanie
fe65b51876 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-13 03:00:48 +01:00
Talun
08e509978d Mantis 55025 Implement script time. 
Signed-off-by: nebadon <michael@osgrid.org>
 2012-04-12 18:44:00 -07:00
Melanie
67d4f1d66c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IScriptModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-09 21:40:03 +01:00
Talun
78c0028179 Mantis5502 implementation of some of the new constants 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-04-09 21:25:22 +01:00
Melanie
f3132c45d9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
32a953fed7 refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part. 2012-03-31 01:52:06 +01:00
Melanie
ed67b698d3 Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-03-22 23:05:58 +00:00
Justin Clark-Casey (justincc)
c4b2d24f33 Add llGiveInventory() test from object to object where both objects are owned by the same user. 2012-03-22 22:17:07 +00:00
Melanie
37049180f6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-02-07 21:09:04 +00:00
Justin Clark-Casey (justincc)
038d1bf742 Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). 
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
 2012-02-07 17:44:37 +00:00
Melanie
567f4c51f8 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:52:17 +00:00
Melanie
45ad9e39a6 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:05:14 +01:00
Melanie
dc612d0f08 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc)
0688861aa7 Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem 2011-11-25 22:15:29 +00:00