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

18357 Commits (36e6edfc65d2fa2b27d473234ee2d22c73cdc58a)

Author SHA1 Message Date
Melanie 36e6edfc65 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-01-26 00:44:32 +00:00
Justin Clark-Casey (justincc) 13d9b64b1d Re-enable error logging associated with assembly and script loading failure in ScriptInstance. 
Swallowing exceptions just leads to more mysterious failures later on.
 2012-01-26 00:28:51 +00:00
Melanie 4ce42762ee Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-26 00:21:21 +00:00
Justin Clark-Casey (justincc) 55c6cbabfd refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI. 
This stops some code having to make spurious client == null checks and reduces regression test complexity.
 2012-01-26 00:10:37 +00:00
Justin Clark-Casey (justincc) 8e5502fdc2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-25 23:24:44 +00:00
Justin Clark-Casey (justincc) 2de3a1b9da refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim() 2012-01-25 23:22:07 +00:00
nebadon d053625663 Update save oar and save iar help responses to reflect new -h|--home 
switches which replace -p|--profile ie: "save oar
--home=http://hg.osgrid.org:80 region.oar"
 2012-01-25 15:59:07 -07:00
Robert Adams e9de7e7107 Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface. 2012-01-25 14:40:38 -08:00
Justin Clark-Casey (justincc) 2e7c1bcfd9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-25 21:26:34 +00:00
Pixel Tomsen 8f53c768f5 llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-01-25 15:48:38 -05:00
Justin Clark-Casey (justincc) 82c3d0cf89 minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db 2012-01-25 20:36:51 +00:00
Justin Clark-Casey (justincc) e20cf3789b Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region. 
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT.  However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
 2012-01-25 19:31:50 +00:00
Melanie 7444f3bfad Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 
Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2012-01-25 15:02:54 +00:00
Melanie f84b69cad1 Change the WorldMapModule to use SOG rather than SOP for the telehub ans 
cover a potential nullref
 2012-01-25 15:00:06 +00:00
Melanie b996517c94 Typo fix 2012-01-25 15:18:31 +01:00
Melanie 24862eaf15 Spin off starting scripts in rezzed objects into a thread to avoid a recursion 
into the script engine if the script was suspended inside an event.
 2012-01-25 14:44:09 +01:00
Melanie 2ca80add14 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 15:24:25 +00:00
BlueWall 959bcfa7f8 Merge branch 'master' of /home/opensim/src/opensim 2012-01-24 21:35:12 -05:00
BlueWall 7c514fe155 Telehub map items displayed 2012-01-24 21:33:11 -05:00
Dan Lake 3d1f43046d Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate 2012-01-24 17:05:53 -08:00
Melanie 427ab55058 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 00:45:57 +00:00
Justin Clark-Casey (justincc) 2d0412d366 Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly. 2012-01-24 22:35:55 +00:00
Justin Clark-Casey (justincc) 8e0eaa980f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-24 22:16:45 +00:00
Justin Clark-Casey (justincc) 09baa3e679 Comment out asset statistics section from periodic stats as these have not been recorded for a very long time. 
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
 2012-01-24 22:14:21 +00:00
BlueWall 3ae6345f1b Merge branch 'master' of /home/opensim/src/opensim 2012-01-24 17:14:08 -05:00
BlueWall dc329202ef Put Telehubs on the map 2012-01-24 17:11:35 -05:00
Justin Clark-Casey (justincc) 5e445aaf7b Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts. 
This has been broken for a long period and would only ever show 0.
 2012-01-24 22:09:13 +00:00
Justin Clark-Casey (justincc) ab8956d58f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-24 22:04:28 +00:00
Justin Clark-Casey (justincc) e8f1e7e96e Comment out inventory statistics section from periodic stats, since this only contained the now uncollected and irrelevant inventory cache number. 2012-01-24 22:03:30 +00:00
Dan Lake 488fe0ae9c Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate 2012-01-24 13:41:26 -08:00
Justin Clark-Casey (justincc) 7e76397a26 minor: correct text and usage for "image queues show" reigon console command. 2012-01-24 20:54:35 +00:00
Justin Clark-Casey (justincc) a704d444f2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-24 20:36:16 +00:00
Justin Clark-Casey (justincc) 8b035dc3c7 Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines. 2012-01-24 18:46:24 +00:00
Melanie 18fd36cba4 Merge branch 'master' into careminster 2012-01-24 04:07:02 +00:00
Melanie 855d3a3ba5 Teleport routing, part 1 2012-01-24 04:06:37 +00:00
Melanie a4977bbe19 Simplify and streamline telehub editing code. Verify rotations and fix 
spwan point positioning on rotated telehubs.
 2012-01-24 02:36:35 +00:00
Melanie 6581849d24 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2012-01-24 03:14:47 +01:00
Melanie ef6d6d20b9 Merge branch 'master' into careminster 2012-01-24 02:36:54 +00:00
Melanie f10288ceae Add handling bans properly 2012-01-24 03:14:00 +01:00
Melanie 0369d21917 Add teleport routing, first part 2012-01-24 03:13:44 +01:00
Melanie 0d2e02efb1 Reverse the spawn point distance vector 2012-01-24 01:30:41 +00:00
Melanie c0e1784e86 Correct a coordinate to make the viewer like it 2012-01-24 01:18:13 +00:00
Melanie cc02f78d4e Simplify and streamline telehub editing code. Verify rotations and fix 
spwan point positioning on rotated telehubs.
 2012-01-24 01:48:38 +01:00
Melanie d51ae0ecac Merge branch 'master' into careminster 2012-01-24 01:31:07 +00:00
Melanie 696fbdfa24 Reverse the spawn point distance vector 2012-01-24 01:29:50 +00:00
Melanie 69e4debc42 Merge branch 'master' into careminster 2012-01-24 01:18:43 +00:00
Melanie 090bf7acca Correct a coordinate to make the viewer like it 2012-01-24 01:17:41 +00:00
Melanie 8fcb9bf418 Correct some SQL syntax 2012-01-24 00:57:52 +00:00
Melanie 7a87be5015 Fix merge artefacts and build break 2012-01-24 00:45:17 +00:00
Melanie 616f2b5861 Merge branch 'master' into careminster 2012-01-24 00:38:34 +00:00