aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2012-09-15 19:33:51 -0700
committerDiva Canto2012-09-15 19:33:51 -0700
commitde69a24574786f7517e8dc3be62e413f9e0fae22 (patch)
treecd70b7896e636dcd342deef926ddd496c4fd408a /OpenSim/Services
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-de69a24574786f7517e8dc3be62e413f9e0fae22.zip
opensim-SC-de69a24574786f7517e8dc3be62e413f9e0fae22.tar.gz
opensim-SC-de69a24574786f7517e8dc3be62e413f9e0fae22.tar.bz2
opensim-SC-de69a24574786f7517e8dc3be62e413f9e0fae22.tar.xz
More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 91cc6eb..556a0da 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -573,6 +573,7 @@ namespace OpenSim.Services.HypergridService
573 private bool IsPartOfAppearance(UUID principalID, UUID itemID) 573 private bool IsPartOfAppearance(UUID principalID, UUID itemID)
574 { 574 {
575 AvatarAppearance a = GetAppearance(principalID); 575 AvatarAppearance a = GetAppearance(principalID);
576
576 if (a == null) 577 if (a == null)
577 return false; 578 return false;
578 579