diff options
| author | Melanie | 2012-10-30 01:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:02:20 +0000 |
| commit | 48569e856a9c9ced207652b10e2abde94c849687 (patch) | |
| tree | 8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.zip opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.gz opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2 opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 74551ea..e76a37b 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -548,7 +548,7 @@ namespace OpenSim.Framework | |||
| 548 | /// <summary> | 548 | /// <summary> |
| 549 | /// Determines whether a point is inside a bounding box. | 549 | /// Determines whether a point is inside a bounding box. |
| 550 | /// </summary> | 550 | /// </summary> |
| 551 | /// <param name='v'>/param> | 551 | /// <param name='v'></param> |
| 552 | /// <param name='min'></param> | 552 | /// <param name='min'></param> |
| 553 | /// <param name='max'></param> | 553 | /// <param name='max'></param> |
| 554 | /// <returns></returns> | 554 | /// <returns></returns> |