Commit Graph

18928 Commits (bfd38ecad49dc9976e816b484bb9e2a1c729b1cb)

Author SHA1 Message Date
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
UbitUmarov 118986f150 added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data. 2012-02-26 17:51:43 +00:00
Melanie fca8c82232 Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
Melanie 356603fff9 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
2012-02-26 15:15:47 +01:00
Melanie ac1e30156a Implement proper selection behavior 2012-02-26 15:09:00 +01:00
Melanie 416f39a561 Implement KeyframedMotion selection behavior 2012-02-26 15:06:05 +01:00
Melanie 8cdc115c91 Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
code.
2012-02-26 14:30:24 +01:00
Melanie 9a15bba99b Fix an infinite recursion caused by checking the wrong values for
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
Melanie aa552d0526 Serialize Keyframe motion for region crossings 2012-02-26 12:29:35 +01: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
Melanie edc78defed Zero force and torque on take so that items don't run away when rezzed 2012-02-26 02:52:08 +01:00
Melanie e9120890a2 Merge branch 'ubitwork' 2012-02-26 02:41:41 +01:00
Melanie c82709c0d6 Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. 2012-02-26 02:36:34 +01:00
UbitUmarov e07440d0c5 changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual) 2012-02-25 22:20:25 +00:00