OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,932 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

3636 Commits (34cb8a2ab3189952cb74a16cf5246a2da3847b7c)

Author SHA1 Message Date
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
SignpostMarv 99cebec4ab adding status codes from rfc 6585 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-24 12:09:15 -04:00
SignpostMarv 87f9aa9d08 porting IDE tooltip-friendly documentation tweaks from Aurora-Sim 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-24 12:09:15 -04:00
Justin Clark-Casey (justincc) 8f88c17df9 refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn 2012-05-23 03:23:37 +01:00
Justin Clark-Casey (justincc) 059a1e90b9 Add ConsoleDisplayList for more consistent formatting of console output in list form. 
Convert "show region" to use this structure rather than hand-constructing
 2012-05-23 03:19:25 +01:00
Justin Clark-Casey (justincc) 2222d979cc refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity 2012-05-23 02:37:38 +01:00
Melanie 6126b6da72 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-05-14 23:32:49 +01:00
Oren Hurvitz 52a32878a9 Save the Telehub and its Spawn Points in the OAR 2012-05-14 19:59:45 +01:00
Melanie fe029cf4e8 Merge branch 'avination' into careminster 2012-05-13 01:25:03 +01:00
Melanie e2dc04586a Merge branch 'master' into careminster 2012-05-13 01:24:01 +01:00
UbitUmarov 7461fe4554 ªTEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc 2012-05-12 15:27:37 +01:00
Justin Clark-Casey (justincc) 8b958e7e74 Revert "Save the Telehub and its Spawn Points in the OAR" 
This reverts commit b0b7b45b94.

Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc.
I wouldn't normally revert but thinks get tricky when it comes to data formats.
Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string
We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
 2012-05-12 02:36:56 +01:00
Oren Hurvitz b0b7b45b94 Save the Telehub and its Spawn Points in the OAR 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-10 22:56:37 -04:00
Justin Clark-Casey (justincc) 903cff9264 Add ConsoleTable framework class for future uniform formatting of console output tables. 
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
 2012-05-10 23:47:39 +01:00
Melanie a90822f4b8 Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc) 6987aef38d Improve logging on the prim inventory script asset request path for future use. 
This adds name and description of the request handler to http request logging when DebugLevel >= 1
 2012-05-09 23:12:30 +01:00
Melanie 05634907e9 Merge branch 'master' into careminster 2012-05-08 00:07:18 +01:00
Oren Hurvitz 15844da3af Log the full exception when errors occur in BaseHttpServer 2012-05-07 19:56:00 +01:00
Melanie df7abbb367 Merge branch 'master' into careminster 2012-05-07 12:07:47 +01:00
dahlia 4032455332 add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object 2012-05-07 00:33:50 -07:00
Melanie b62cc3ce0a Merge branch 'avination' into careminster 2012-05-05 10:32:22 +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
Justin Clark-Casey (justincc) 6096a1f30e Change LongCallTime on WebUtil to 3000, to match the time where request handling is considered "slow". 
This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls.
LongCallTime may need to be made configurable.
 2012-05-04 20:53:30 +01:00
Melanie 197163e12a Fix teleporting from older to newer regions 2012-05-04 21:00:41 +02:00
Melanie 333d013b5c Add the default animation to the child agent data update 2012-05-04 20:33:48 +02:00
Justin Clark-Casey (justincc) fb99ee6774 minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests. 2012-05-04 01:16:56 +01:00
Justin Clark-Casey (justincc) c9faf0df74 Extend 'slow' request logging to other server outbound requests (forms, rest, async rest) as well as the existing logging on outbound OSD requests. 
Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
 2012-05-04 01:12:56 +01:00
Justin Clark-Casey (justincc) 231a3bf147 Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable. 
This is most useful for capabilities where the url is not self-describing.
 2012-05-03 01:45:49 +01:00
Melanie 9f9693dab8 Clear permissions given to the object we stand up from 2012-05-03 01:18:51 +02:00
Melanie ad12b5df49 Merge branch 'master' into careminster 2012-04-29 02:23:54 +01:00
Justin Clark-Casey (justincc) 133f05dc41 Add text about using double quotes to surround console command arguments containing spaces to "help" text. 
e.g. show object name "My long object name"
 2012-04-28 00:29:08 +01:00
Justin Clark-Casey (justincc) 737e177163 Revert "Log the full exception when errors occur in BaseHttpServer" 
This reverts commit e31e7c68c8.

Applied for patch assessment and accidentally committed too early.
 2012-04-27 23:46:46 +01:00
Oren Hurvitz e31e7c68c8 Log the full exception when errors occur in BaseHttpServer 2012-04-27 21:52:04 +01: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
Melanie 7397c9a68e Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-27 01:31:12 +01:00
Oren Hurvitz 0da8fe3124 Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type. 2012-04-26 22:49:14 +01:00
UbitUmarov fc576df273 revert last add commit 2012-04-26 18:24:36 +01:00
UbitUmarov f194c48cd3 add wearable type PHYSICS 2012-04-26 17:42:11 +01:00
UbitUmarov fd19601c6b Help big boobies to dance (avatar visualParams). May not persist and need more lobe ? 2012-04-26 16:17:46 +01:00
Justin Clark-Casey (justincc) 4c4ffb9868 Add request verb and url to error messages in WebUtil that lack this. 
Make exception printing consistent across windows and mono.
 2012-04-26 00:43:31 +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) ef1668adb3 Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type." 
This reverts commit d3a4d67a20.

Accidentally committed this when I didn't mean to yet.
 2012-04-24 21:42:32 +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
Oren Hurvitz d3a4d67a20 Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type. 2012-04-24 20:52:18 +01: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
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) f3dda2d85d Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest() 2012-04-20 03:12:25 +01:00
Melanie c2be894330 Fx up estate settings 2012-04-18 23:23:01 +01:00