diff options
| author | Melanie | 2013-01-25 00:10:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-25 00:10:32 +0000 |
| commit | 0b8bf69470aa461ac8b6554dce5e56427f39ac74 (patch) | |
| tree | 9e2175c461425d1abc6ffbdb7d19278a9bf82c2e /OpenSim/Region/UserStatistics/Updater_distributor.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: reduce the zeroing threshold for rotational velocity. (diff) | |
| download | opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.zip opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.gz opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.bz2 opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/UserStatistics/Updater_distributor.cs')
| -rw-r--r-- | OpenSim/Region/UserStatistics/Updater_distributor.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/UserStatistics/Updater_distributor.cs b/OpenSim/Region/UserStatistics/Updater_distributor.cs index 9593cc9..601e06b 100644 --- a/OpenSim/Region/UserStatistics/Updater_distributor.cs +++ b/OpenSim/Region/UserStatistics/Updater_distributor.cs | |||
| @@ -62,5 +62,9 @@ namespace OpenSim.Region.UserStatistics | |||
| 62 | return pModelResult["js"].ToString(); | 62 | return pModelResult["js"].ToString(); |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | public string RenderJson(Hashtable pModelResult) { | ||
| 66 | return "{}"; | ||
| 67 | } | ||
| 68 | |||
| 65 | } | 69 | } |
| 66 | } \ No newline at end of file | 70 | } \ No newline at end of file |