diff options
| author | Justin Clark-Casey (justincc) | 2011-12-07 17:33:06 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-12-07 17:33:06 +0000 |
| commit | 2b02d3dc84b7b255dfd2b727df8258b886f4c45f (patch) | |
| tree | 7269b569136b62f3eaa393b0b5c2a1db4e750e11 | |
| parent | Implement XMLRPCAdmin command admin_teleport_agent. (diff) | |
| parent | Trigger a Jenkins build (diff) | |
| download | opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.zip opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.gz opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.bz2 opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 1 | ||||
| -rwxr-xr-x | bin/Nini.dll | bin | 55808 -> 56320 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 20480 -> 24576 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.dll | bin | 1736704 -> 1753088 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverseTypes.dll | bin | 114688 -> 114688 bytes |
6 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index bae44ee..55ba18a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -62,6 +62,7 @@ namespace OpenSim | |||
| 62 | 62 | ||
| 63 | // These are the names of the plugin-points extended by this | 63 | // These are the names of the plugin-points extended by this |
| 64 | // class during system startup. | 64 | // class during system startup. |
| 65 | // | ||
| 65 | 66 | ||
| 66 | private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache"; | 67 | private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache"; |
| 67 | private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient"; | 68 | private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient"; |
diff --git a/bin/Nini.dll b/bin/Nini.dll index c421005..2d16d95 100755 --- a/bin/Nini.dll +++ b/bin/Nini.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index a6dec04..e0a3aa5 100755 --- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll +++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index ed0a2d6..aa05418 100755 --- a/bin/OpenMetaverse.StructuredData.dll +++ b/bin/OpenMetaverse.StructuredData.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 37ec47a..523f5a7 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 6f7fbac..e3356c9 100755 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
| Binary files differ | |||