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
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
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
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
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
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
Melanie
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
Melanie
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
Melanie
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
BlueWall
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
BlueWall
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
BlueWall
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
BlueWall
0037577814
Merge branch 'telehub'
2012-01-23 11:10:42 -05:00
BlueWall
9cfc43005d
Cleanup
2012-01-23 10:28:18 -05:00
BlueWall
39c9b656c8
Cleanup unused parts, add some error handling
2012-01-23 09:42:15 -05:00
Melanie
f7bd7c5901
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-22 23:21:35 +00:00
Melanie
7c404375c7
Fix up some parameter naming
2012-01-22 23:20:10 +00:00
BlueWall
d1ef7ee5ca
Add note about setting up test databases
2012-01-22 16:27:49 -05:00
BlueWall
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
BlueWall
1cd26ba85e
Hooking up new telehub data to the database
2012-01-22 11:46:16 -05:00
Melanie
24b20f6e4b
Change the key name I missed in last commit
2012-01-22 15:35:14 +00:00
Melanie
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
BlueWall
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
BlueWall
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
BlueWall
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
Justin Clark-Casey (justincc)
a0fb1e1788
Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE."
...
This reverts commit 4eef6725f4
.
Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances.
2012-01-20 17:51:12 +00:00
Justin Clark-Casey (justincc)
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
Justin Clark-Casey (justincc)
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00