ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 11:15:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,345 Commits 5 Branches 93 Tags
c19183932e8daae7a178ae034985365c7af2bcb6
Commit Graph

81 Commits

Author SHA1 Message Date
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
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
Justin Clark-Casey (justincc)
31989bd51e Show texture ids for full object/part info console commmds 2013-10-24 21:29:57 +01:00
Melanie
5ddcc25ee9 Merge branch 'master' into careminster 2013-07-04 22:32:58 +01:00
Justin Clark-Casey (justincc)
d01b8e163d minor: Correct typo of "Descrition" to "Description" in "show object *" console commands 
Thanks to Ai Austin for pointing this out.
 2013-07-03 00:27:22 +01:00
Melanie
3696a668a8 Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster 2013-03-29 02:21:06 +00:00
Justin Clark-Casey (justincc)
4dfffa1df3 Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands 2013-03-29 01:31:37 +00: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
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Justin Clark-Casey (justincc)
a671c06ee5 Correct mistake in parsing 'show object pos' and similar pos commands where the 'to' text would be treat as the end vector rather than discarded. 
Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
 2013-02-20 22:09:33 +00:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
c3fb114461 minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag 2013-01-26 00:31:50 +00:00
Melanie
daa1d99513 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
 2012-11-30 01:19:08 +00:00
Justin Clark-Casey (justincc)
c17ea2049b Show many more primitive properties on console command "show part name/id/pos" 2012-11-28 01:42:58 +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
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
81aeecc907 Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID. 
This means that the sub-commands are now id rather than uuid, e.g. show object id
 2012-10-24 04:10:22 +01:00
Justin Clark-Casey (justincc)
f76dceb90b Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing. 
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
 2012-10-24 03:08:58 +01:00
Justin Clark-Casey (justincc)
73db057fa1 Add "dump object uuid" console command. This allows any object in the scene to be serialized and dumped to XML for debug purposes. 2012-10-24 02:05:28 +01:00
Justin Clark-Casey (justincc)
938fa96b9f minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp 2012-10-24 01:33:21 +01:00
Justin Clark-Casey (justincc)
9417176389 Make "show part" console commands print out information about each item the part contains 2012-10-19 00:37:25 +01:00
Melanie
29ab5a6bfe Merge branch 'master' into careminster 2012-10-19 00:32:25 +01:00
Justin Clark-Casey (justincc)
845228b35e minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDisplayList 2012-10-18 23:58:29 +01:00
Melanie
4fe6d8c3a4 Merge branch 'master' into careminster 2012-10-18 23:48:35 +01:00
Justin Clark-Casey (justincc)
75f5e66d1c Add local and UUID to information output of "show object" and "show part" region console commands 2012-10-18 23:45:07 +01:00
Justin Clark-Casey (justincc)
1f3c9db2b9 Add --full option to "show object name/uuid/pos" to show info on all parts of an object, not just whole object summary information. 2012-10-18 23:41:18 +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
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
b768c35f6f Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRange() in order to fix mono 2.4.3 compile failure. 
This doesn't fail the compile on mono 2.10.8.
 2012-10-11 00:05:34 +01:00
Justin Clark-Casey (justincc)
efd9791506 Add "delete object pos <start-coord> to <end-coord>" console command. 
This allows one to delete objects within a certain volume.
See help on console for more details.
 2012-10-10 23:30:48 +01:00
Melanie
f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
Justin Clark-Casey (justincc)
1fb53e7103 Fix bug in implementation of "show part pos" that would not filter probably. 
Also refactors more of ObjectCommandsModule to remove duplicate code
 2012-10-05 04:31:43 +01:00
Justin Clark-Casey (justincc)
22f6fa49e3 Add "show part pos" console command to match "show object pos" 2012-10-05 04:22:08 +01:00
Justin Clark-Casey (justincc)
16feed456a refactor: eliminate some now duplicate code in ObjectCommandsModule 2012-10-05 04:16:38 +01:00
Justin Clark-Casey (justincc)
130768b16a Add "show object pos <start-coord> to <end-coord>" command to simulator console. 
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
 2012-10-05 03:52:42 +01:00
Justin Clark-Casey (justincc)
046113c137 Print number of objects found with "show object name" and "show part name" simulator console commands 2012-10-05 01:46:28 +01:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Melanie
41a1903c60 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-06-28 03:21:08 +01:00
Justin Clark-Casey (justincc)
0b29877790 Fix output for help on some object region console commands 2012-06-26 23:15:15 +01:00
Melanie
597f99bca7 Merge branch 'master' into careminster 2012-05-16 12:40:45 +01:00
Justin Clark-Casey (justincc)
02f3b116c6 Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used. 
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
 2012-05-15 23:42:49 +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
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