diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Region/UserStatistics/SimStatsAJAX.cs | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/UserStatistics/SimStatsAJAX.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs index 8c04e71..28051fb 100644 --- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs | |||
| @@ -33,7 +33,7 @@ using System.Text; | |||
| 33 | using Mono.Data.SqliteClient; | 33 | using Mono.Data.SqliteClient; |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
| 36 | using OpenSim.Framework.Statistics; | 36 | using OpenSim.Framework.Monitoring; |
| 37 | 37 | ||
| 38 | namespace OpenSim.Region.UserStatistics | 38 | namespace OpenSim.Region.UserStatistics |
| 39 | { | 39 | { |