diff options
author | Melanie | 2009-10-05 10:17:23 +0100 |
---|---|---|
committer | Melanie | 2009-10-05 10:17:23 +0100 |
commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /bin | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Make the asset connector async Get overload return false if the asset (diff) | |
download | opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
-rw-r--r-- | bin/CSJ2K.dll | bin | 544768 -> 491520 bytes | |||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll index ff7e809..31e0d59 100644 --- a/bin/CSJ2K.dll +++ b/bin/CSJ2K.dll | |||
Binary files differ | |||
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index e9d3728..6607a1a 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | [GridService] | 18 | [GridService] |
19 | ; | 19 | ; |
20 | ; change this to your grid-wide inventory server | 20 | ; change this to your grid-wide grid server |
21 | ; | 21 | ; |
22 | GridServerURI = "http://mygridserver.com:8001" | 22 | GridServerURI = "http://mygridserver.com:8001" |
23 | 23 | ||