diff options
| author | Melanie | 2013-02-07 20:51:51 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 20:51:51 +0000 |
| commit | 45f5a6a6db16538d864ff90ab6952aea13007514 (patch) | |
| tree | 48583f7c77afd88a4760ea9db9159741f659fe5b /OpenSim/Region/Physics/Manager/IPhysicsParameters.cs | |
| parent | Rename Bounciness to Restitution (diff) | |
| parent | Change passed PhysicsParameter value from float to the more general string value (diff) | |
| download | opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.zip opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.gz opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.bz2 opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
bin/HttpServer_OpenSim.dll
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/Manager/IPhysicsParameters.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/IPhysicsParameters.cs b/OpenSim/Region/Physics/Manager/IPhysicsParameters.cs index b8676ba..31a397c 100755 --- a/OpenSim/Region/Physics/Manager/IPhysicsParameters.cs +++ b/OpenSim/Region/Physics/Manager/IPhysicsParameters.cs | |||
| @@ -60,14 +60,14 @@ namespace OpenSim.Region.Physics.Manager | |||
| 60 | 60 | ||
| 61 | // Set parameter on a specific or all instances. | 61 | // Set parameter on a specific or all instances. |
| 62 | // Return 'false' if not able to set the parameter. | 62 | // Return 'false' if not able to set the parameter. |
| 63 | bool SetPhysicsParameter(string parm, float value, uint localID); | 63 | bool SetPhysicsParameter(string parm, string value, uint localID); |
| 64 | 64 | ||
| 65 | // Get parameter. | 65 | // Get parameter. |
| 66 | // Return 'false' if not able to get the parameter. | 66 | // Return 'false' if not able to get the parameter. |
| 67 | bool GetPhysicsParameter(string parm, out float value); | 67 | bool GetPhysicsParameter(string parm, out string value); |
| 68 | 68 | ||
| 69 | // Get parameter from a particular object | 69 | // Get parameter from a particular object |
| 70 | // TODO: | 70 | // TODO: |
| 71 | // bool GetPhysicsParameter(string parm, out float value, uint localID); | 71 | // bool GetPhysicsParameter(string parm, out string value, uint localID); |
| 72 | } | 72 | } |
| 73 | } | 73 | } |