ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-07 12:08:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,944 Commits 5 Branches 97 Tags
eb9458fd7e3a9098712f501cdcf05d71f741ec14
Commit Graph

1663 Commits

Author SHA1 Message Date
Melanie
eb9458fd7e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc)
239a8da74e Fix potential concurrency issue since the LSL notecard cache was not being checked for expiry under lock 2013-02-28 21:19:23 +00:00
Justin Clark-Casey (justincc)
a523ed1e4d Fix bug where simultaneous calls by different scripts to llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event. 
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
 2013-02-28 21:15:14 +00:00
Diva Canto
3cc3a8e5bf Removed duplicate 'using' statement. 2013-02-27 21:12:27 -08:00
Diva Canto
bb44758179 Switched to using the other Util function with a default value. 2013-02-27 20:59:16 -08:00
Diva Canto
64b8ce73da Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-27 20:50:03 -08:00
Diva Canto
f1010d7b15 Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now. 2013-02-27 20:49:41 -08:00
Melanie
578174d21c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f Add regression test for llRequestUrl() 2013-02-26 23:36:36 +00:00
Melanie
e3ea2c4bee Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-02-23 20:37:09 +00:00
Diva Canto
0e8289cd00 Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup] 2013-02-22 15:57:33 -08:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
e515cdddec Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. 2013-02-21 17:26:19 -08:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Melanie
9d55a2298d Merge branch 'master' into careminster 2013-02-14 07:45:23 +00:00
Justin Clark-Casey (justincc)
69d0e168fb Fix a very unlikely-to-occur NullReferenceException race condition in llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it 2013-02-14 00:20:23 +00:00
Melanie
8b78b9429d Merge branch 'avination' into careminster 2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3 Rename Bounciness to Restitution 2013-02-07 21:25:55 +00:00
Melanie
6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie
6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Melanie
e5beb480ea Partial port of Avination's support for the new physics parameters. 
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
 2013-02-06 08:03:04 +00:00
Melanie
f567ff9f51 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-06 02:22:12 +00:00
Justin Clark-Casey (justincc)
5c94346bd7 refactor: Move functions that lookup asset ids from task inventory or pass them through to ScriptUtils class in OpenSim.Region.Framework.dll 
Renames functions to better reflect what they do.
This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
 2013-02-06 01:17:19 +00:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Melanie
128910a681 Make scripts shout a error but not stop when button count is overrun on llDialog 2013-02-05 05:40:51 +01:00
Justin Clark-Casey (justincc)
562067eb16 Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one. 
This was not working because the shouter was wrongly signalled as an agent rather than a prim
 2013-02-05 02:09:21 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
2ff301ca11 Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom 2013-02-02 01:34:49 +00:00
Melanie
8f949513fd Merge branch 'master' into careminster 2013-01-26 16:58:02 +00:00
Talun
ceabb1b49a Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams 
Correction so that scripts can turn Flexi off as well as on.
 2013-01-26 02:55:24 +00:00
Melanie
0b8bf69470 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-01-25 00:10:32 +00:00
Melanie
c6e6614a44 Merge branch 'avination' into careminster 2013-01-24 23:25:38 +00:00
Melanie
789e9901dd Make llGiveMoney async again. The return value is now the constant 1 to make 
scripts work properly. Scripts will no longer receive a failure indication through
this return value;
 2013-01-24 21:32:25 +01:00
Melanie
e785242c49 Reintroduce the return value of llGiveMoney. The grid will crash and burn without it. 2013-01-24 18:23:39 +01:00
teravus
878df52515 * This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray. 2013-01-23 21:58:51 -05:00
Melanie
be4c8c4931 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc)
55c6753b13 Merge branch 'master' into cooptermination 2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc)
8a22ac3f94 Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs. 
APIs don't need to reference any methods on EventWaitHandle
 2013-01-23 23:38:08 +00:00
Melanie
c1795ed399 Add the Avination physics raycast glue so Core Physics can implement raycast 2013-01-23 21:03:24 +00:00
Melanie
dd6ddcc7a5 Prevent double ground collisions and prefer the physics result if there is one. 
ODE is known to not see the ground sometimes on raycast so the double test is
needed.
 2013-01-23 20:58:47 +01:00
Melanie
6a2b673fca Remove the return value from llGiveMoney and add llTransferLindenDollars. Also 
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 19:45:36 +00:00
Melanie
fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie
c75508ec8d Fix a type (Suports => Supports). Also put the normal terrain collision check 
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
 2013-01-23 20:29:05 +01:00
Melanie
47f18caa22 Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and 
make the function async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 18:58:29 +01:00
Melanie
f667428283 Guard against XMLRPC module ref being null, which will happen if it's disabled 2013-01-23 16:11:37 +01:00
teravus
6007eae00f Merge remote-tracking branch 'remotes/origin/avination' into teravuswork 2013-01-21 21:34:49 -05:00
Robert Adams
95c53ecae7 Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter 
routines on the physics engine. Won't make a difference for any
existing scripts since ODE always returned Vector3.Zero.
 2013-01-21 15:55:54 -08:00
teravus
09a3e134e4 * Fix notecard loading - If the notecard name is formatted like a UUID but isn't an actual asset UUID, then try to load it like an asset id first, then try to load it as a task inventoryitem name. If the passed UUID is a string, try to load it like a task inventory item name. 2013-01-21 17:30:38 -05:00
Melanie
903cc71f0d Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFast 2013-01-19 22:53:51 +01:00