aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorCharles Krinke2009-06-02 21:13:29 +0000
committerCharles Krinke2009-06-02 21:13:29 +0000
commit23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9 (patch)
tree84b777bb23c1e0742dbcd072e58cc5a0a6b5d803 /OpenSim/Region/Application
parentThank you kindly, jonc, for a patch that: (diff)
downloadopensim-SC_OLD-23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9.zip
opensim-SC_OLD-23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9.tar.gz
opensim-SC_OLD-23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9.tar.bz2
opensim-SC_OLD-23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9.tar.xz
Thank you kindly, MattSetzer, for a patch that solves a Mantis:
This appears to be due to the fact that no asset cache has been configured, possibly as a result of the configuration changes that have been made recently. I've attached a patch to display a message to that effect rather than throwing an error.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs18
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 36fad48..aef0b91 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -413,7 +413,14 @@ namespace OpenSim
413 413
414 private void HandleClearAssets(string module, string[] args) 414 private void HandleClearAssets(string module, string[] args)
415 { 415 {
416 m_assetCache.Clear(); 416 if (AssetCache != null)
417 {
418 AssetCache.Clear();
419 }
420 else
421 {
422 m_log.Info("Asset cache is not configured.");
423 }
417 } 424 }
418 425
419 private void HandleForceUpdate(string module, string[] args) 426 private void HandleForceUpdate(string module, string[] args)
@@ -787,7 +794,14 @@ namespace OpenSim
787 switch (showParams[0]) 794 switch (showParams[0])
788 { 795 {
789 case "assets": 796 case "assets":
790 m_assetCache.ShowState(); 797 if (AssetCache != null)
798 {
799 AssetCache.ShowState();
800 }
801 else
802 {
803 m_log.Info("Asset cache is not configured.");
804 }
791 break; 805 break;
792 806
793 case "users": 807 case "users":