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
UbitUmarov
f42fd7fb77
update ubitODE
2012-03-02 15:05:30 +00:00
Justin Clark-Casey (justincc)
6e3523e25e
minor: remove mono compiler warning
2012-03-02 04:08:07 +00:00
Justin Clark-Casey (justincc)
2a2656f629
Merge branch 'master' into xassetservice
2012-03-02 04:01:53 +00:00
Justin Clark-Casey (justincc)
be4199c3bc
Make XAssetService a de-duplicating asset service.
...
This is an extremely crude implemenation which almost works by accident. Nevertheless it does work.
It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing
It does not interact at all with the existing asset service or any data stored there.
This code is subject to change without notice and should not be used for anything other than gawking.
2012-03-02 03:57:55 +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)
dd63cd1656
Start by adding XAssetService as a copy of the existing AssetService.
...
This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets.
Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default.
Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429
More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service
Feedback and discussion welcome as commits are made.
2012-03-02 02:23:35 +00: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
UbitUmarov
ee4d3bfad2
ubitODE bug fix
2012-02-29 19:36:16 +00:00
UbitUmarov
a8f1cd7e86
update ubitODE to current working state
2012-02-29 19:32:23 +00:00
UbitUmarov
a0d75be56b
fix
2012-02-29 05:14:29 +00:00
UbitUmarov
42ddb0e88f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-29 05:08:13 +00:00
UbitUmarov
5534cf8b57
chODE: bad meshs get a a basic box or sphere geom with setted prim size. They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
2012-02-29 05:03:26 +00: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
UbitUmarov
a8a7bb549d
made box a little larger
2012-02-28 20:24:03 +00:00
UbitUmarov
1c7700db88
A few blind changes to go try to go around bad mesh little box replacement fail
2012-02-28 20:14:26 +00:00
Melanie
f11ab97747
Fix and hook up llTeleportAgent
2012-02-28 20:51:19 +01:00
Melanie
0fb50a8a9e
Implement llTeleportAgent
2012-02-28 20:48:31 +01:00
Melanie
9bad3b846f
Really dirty hack to make sims start. Causes errors but the ting runs. Remove
...
when fixed right.
2012-02-28 10:37:46 +01:00
Mic Bowman
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
UbitUmarov
a725b5e01e
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
2012-02-27 20:08:43 +00:00
Melanie
960c575dd2
Merge branch 'ubitwork'
2012-02-27 10:35:38 +01:00
Melanie
aee4ca2f1c
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
2012-02-27 08:50:19 +01:00
Melanie
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
UbitUmarov
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
UbitUmarov
f451f67213
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-27 01:31:29 +00:00
Melanie
d46235f5a3
Merge branch 'ubitwork'
2012-02-26 21:17:31 +01:00
Melanie
e5e5b94cbe
Make llSetKeyframedMotion prims waut at the borders of down sims and try again
...
periodically.
2012-02-26 21:16:24 +01:00
UbitUmarov
d8ecc28df5
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-26 18:43:56 +00:00