8f53c768f5
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-25 15:48:38 -05:00
82c3d0cf89
minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db
2012-01-25 20:36:51 +00:00
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
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
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
b996517c94
Typo fix
2012-01-25 15:18:31 +01:00
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
2ca80add14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 15:24:25 +00:00
959bcfa7f8
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 21:35:12 -05:00
7c514fe155
Telehub map items displayed
2012-01-24 21:33:11 -05:00
3d1f43046d
Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate
2012-01-24 17:05:53 -08:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
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
8e0eaa980f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:16:45 +00:00
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
3ae6345f1b
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 17:14:08 -05:00
dc329202ef
Put Telehubs on the map
2012-01-24 17:11:35 -05:00
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
ab8956d58f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:04:28 +00:00
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
488fe0ae9c
Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate
2012-01-24 13:41:26 -08:00
7e76397a26
minor: correct text and usage for "image queues show" reigon console command.
2012-01-24 20:54:35 +00:00
a704d444f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 20:36:16 +00:00
8b035dc3c7
Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines.
2012-01-24 18:46:24 +00:00
18fd36cba4
Merge branch 'master' into careminster
2012-01-24 04:07:02 +00:00
855d3a3ba5
Teleport routing, part 1
2012-01-24 04:06:37 +00:00
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
6581849d24
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-24 03:14:47 +01:00
ef6d6d20b9
Merge branch 'master' into careminster
2012-01-24 02:36:54 +00:00
f10288ceae
Add handling bans properly
2012-01-24 03:14:00 +01:00
0369d21917
Add teleport routing, first part
2012-01-24 03:13:44 +01:00
0d2e02efb1
Reverse the spawn point distance vector
2012-01-24 01:30:41 +00:00
c0e1784e86
Correct a coordinate to make the viewer like it
2012-01-24 01:18:13 +00:00
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
d51ae0ecac
Merge branch 'master' into careminster
2012-01-24 01:31:07 +00:00
696fbdfa24
Reverse the spawn point distance vector
2012-01-24 01:29:50 +00:00
69e4debc42
Merge branch 'master' into careminster
2012-01-24 01:18:43 +00:00
090bf7acca
Correct a coordinate to make the viewer like it
2012-01-24 01:17:41 +00:00
8fcb9bf418
Correct some SQL syntax
2012-01-24 00:57:52 +00:00
7a87be5015
Fix merge artefacts and build break
2012-01-24 00:45:17 +00:00
616f2b5861
Merge branch 'master' into careminster
2012-01-24 00:38:34 +00:00
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
07ad821157
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
2012-01-24 00:36:42 +00:00
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
48379e6442
IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the
...
Telehub commits! They will eat your babies and corrupt your database while
they munch. DO NOT use anything from the first Telehub commit to this one.
FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
2012-01-23 21:23:55 +00:00
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
0037577814
Merge branch 'telehub'
2012-01-23 11:10:42 -05:00
Pixel Tomsen