Merge branch 'ldmud36' of ssh://mgg/mudlib-public into ldmud36

Change-Id: Id3c731686758aead01b58333a69f308f123e4483
diff --git a/std/room/description.c b/std/room/description.c
index 9aa0971..1886d43 100644
--- a/std/room/description.c
+++ b/std/room/description.c
@@ -97,6 +97,7 @@
 varargs string int_long(mixed viewer,mixed viewpoint,int flags)
 {
   string descr, inv_descr;
+  string|int transparency;
 
   flags &= 3;
   if( IS_LEARNER(viewer) && viewer->QueryProp( P_WANTS_TO_LEARN ) )
@@ -125,14 +126,14 @@
   if ( inv_descr != "" )
     descr += inv_descr;
 
-  if(environment() && (inv_descr=QueryProp(P_TRANSPARENT)))
+  if(environment() && (transparency=QueryProp(P_TRANSPARENT)))
   {
-    if(stringp(inv_descr)) descr += inv_descr;
+    if(stringp(transparency)) descr += transparency;
     else                   descr += "Ausserhalb siehst Du:\n";
-            
+
     descr += environment()->int_short(viewer,ME);
   }
-                  
+
   return descr;
 }