BlueWall
6fc350725d
Merge branch 'master' into v3_support
2012-03-02 15:02:09 -05:00
Dan Lake
64a036b4cf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-02 09:19:35 -08:00
Dan Lake
8d249f8456
ScenePresence line endings and fix AllowMovement default to true.
2012-03-02 09:19:13 -08:00
Justin Clark-Casey (justincc)
6e3523e25e
minor: remove mono compiler warning
2012-03-02 04:08:07 +00:00
Diva Canto
8fccd2b555
Send the right name and creation date on the BasicProfileModule.
2012-03-01 19:55:51 -08:00
Dan Lake
e8779cd9e5
In ScenePresence, removed several private variables used to store public parameters. They were only used by the get/set and make code harder to refactor.
2012-03-01 19:22:05 -08:00
Justin Clark-Casey (justincc)
ec48a2f32b
minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"
2012-03-02 01:54:48 +00:00
Justin Clark-Casey (justincc)
94971bf3b9
Provide feedback on bot login states in pCampbot
2012-03-02 01:31:28 +00:00
Justin Clark-Casey (justincc)
d8c4985527
Move SenseRepeaters.Count check inside the SenseRepeatListLock.
...
No methods in the List class are thread safe in the MS specification/documentation
2012-03-02 00:28:37 +00:00
Justin Clark-Casey (justincc)
dcfd05c8ea
lock SenseRepeatListLock when added a new sensor during script reconstitution.
...
This is already being done in the other place where a sensor is added.
Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
2012-03-02 00:22:23 +00:00
Mic Bowman
8a375f3c30
Adds an OSSL command for regular expression-based string replacement. Parameters
...
are osReplaceString(string source, string patter, string replace, integer count, integer start)
The count parameter specifies the total number of replacements to make, -1 makes
all replacements.
2012-03-01 14:49:49 -08:00
BlueWall
7a88d21e59
Merge branch 'master' of /home/opensim/src/opensim
2012-03-01 14:20:46 -05:00
BlueWall
a2b0ed537e
Fix indexing on string trim
...
Thanks to zadark for pointing this out,
smxy for deciphering the ?: operator and
Plugh for the fix \o/ yay for IRC
2012-03-01 14:18:48 -05:00
Justin Clark-Casey (justincc)
0007711eb5
Use a fully stubbed out MockConsole for unit tests rather than inheriting from CommandConsole.
...
This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands.
This prevents the scene from being garbage collected at the end of a test.
This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
2012-03-01 03:23:10 +00:00
Justin Clark-Casey (justincc)
255afbf08a
Remove more now unused third party libraries.
2012-03-01 02:11:15 +00:00
Justin Clark-Casey (justincc)
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
Justin Clark-Casey (justincc)
1e95b01f13
Extend distsrc target to cleanup the files generated by running prebuild
2012-02-29 21:51:46 +00:00
BlueWall
69c999033b
Revert "Fix authentication for OpenID provider"
...
This reverts commit 9f597c2d42
. Fixing OpenID causes issues with other parts of the code.
2012-02-29 15:52:15 -05:00
BlueWall
1a54e76948
Trigger a build
2012-02-29 14:54:06 -05:00
BlueWall
df75f5ae37
Merge branch 'master' of /home/opensim/src/opensim
2012-02-29 14:42:36 -05:00
BlueWall
afc9a7d3f9
Merge branch 'master' of /home/opensim/src/opensim into v3_support
2012-02-29 14:39:51 -05:00
BlueWall
9f597c2d42
Fix authentication for OpenID provider
2012-02-29 14:39:07 -05:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
670c7842a4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-29 00:03:55 +00:00
Justin Clark-Casey (justincc)
2fce7dd593
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-28 22:54:21 +00:00
Kevin Cozens
a813e7ffdd
Fixed two typos. White space cleanups.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-28 14:12:39 -07:00
Mic Bowman
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
Diva Canto
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
BlueWall
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
PixelTomsen
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
Justin Clark-Casey (justincc)
4a5f9fe6a2
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-25 04:26:32 +00:00
Justin Clark-Casey (justincc)
6159110258
Remove some more unused Bullet libraries.
2012-02-25 04:22:59 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
Justin Clark-Casey (justincc)
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
PixelTomsen
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
Justin Clark-Casey (justincc)
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
PixelTomsen
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
BlueWall
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
Melanie
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
Melanie
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