df75f5ae37
Merge branch 'master' of /home/opensim/src/opensim
2012-02-29 14:42:36 -05:00
afc9a7d3f9
Merge branch 'master' of /home/opensim/src/opensim into v3_support
2012-02-29 14:39:51 -05:00
9f597c2d42
Fix authentication for OpenID provider
2012-02-29 14:39:07 -05:00
a181fae722
Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password
2012-02-29 03:00:56 +00:00
40c838896c
Use correct casing of RegionSettings.Sandbox in the various database modules.
...
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it? Or one day sqlite can change to Sandbox.
2012-02-29 00:33:17 +00:00
670c7842a4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-29 00:03:55 +00:00
2fce7dd593
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-28 22:54:21 +00:00
a813e7ffdd
Fixed two typos. White space cleanups.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-28 14:12:39 -07:00
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
01f454242d
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
...
http://opensimulator.org/mantis/view.php?id=5763
2012-02-25 15:33:33 +00:00
4a5f9fe6a2
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-25 04:26:32 +00:00
6159110258
Remove some more unused Bullet libraries.
2012-02-25 04:22:59 +00:00
ca19b9078f
Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.
2012-02-25 03:36:43 +00:00
6138662716
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
2012-02-25 03:25:56 +00:00
3fbcd21916
Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like these were once connected with HttpServer.dll but are now unused.
2012-02-25 03:12:41 +00:00
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
f9066e7d86
Establish a distsrc nant target for producing the source distribution.
...
This is in addition to the distbin target. The distbin target now needs distsrc to be run first.
Still needs some extra tweaking that I shall eventually put in as sed invocations or similar.
2012-02-25 00:36:28 +00:00
7b5e42c744
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
2012-02-24 23:10:41 +00:00
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
fe229f10e6
In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set speed.
2012-02-24 04:08:59 +00:00
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
f034958bdc
Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.
...
This should resolve http://opensimulator.org/mantis/view.php?id=5901
2012-02-23 23:11:47 +00:00
90ea00a109
Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.
...
This involves
1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport()
2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1
This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else.
This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
2012-02-23 22:56:42 +00:00
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
1dfc990264
Add a position parameter to region crossing of objects. This avoids the
...
potential bad update that places an object at the opposite side of the
origin sim for a moment before actually crossing it. Especially important in
grids like OSG where lag between sims is high.
2012-02-23 01:40:30 +00:00
165ae251ec
V3 Support
...
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
2012-02-22 16:36:28 -05:00
67bea681e2
Add web profile url setting to ini
2012-02-21 23:04:49 -05:00
5d31267185
Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null.
2012-02-22 00:55:16 +00:00
cf9b3e7708
Restore the taskItem null check that I accidentally blatted in 5397a6d
...
This is a valid check because the caller could supply an invalid uuid.
2012-02-21 23:41:48 +00:00
1c533eb520
Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim
2012-02-21 23:15:33 +00:00
5397a6d4c6
Fix problem with dragging child part inventory item to user inventory.
...
This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller.
Resolves http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:54:30 +00:00
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73cacahttp://opensimulator.org/mantis/view.php?id=5569 , I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:07:12 +00:00
7cf970fb27
V3 Support:
...
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
2012-02-21 14:21:03 -05:00
a27e5a9c95
Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64
2012-02-21 04:12:17 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
a15b00d3ef
Replace previous windows 64-bit sqlite3.dll with one from http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip
...
In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll
This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not.
This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference.
This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
2012-02-21 04:01:27 +00:00
1b906ef2ad
Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either.
2012-02-21 03:24:01 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
90dc5f47e7
Fix bug where NPCs would establish child agents on other neighbour regions that had come up after the NPC was created.
2012-02-21 01:57:19 +00:00
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
99b9c1a9d5
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 10:58:07 -08:00
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
BlueWall