Permalink
Browse files

These checks appear to be having the opposite effect of keeping thing…

…s in view that should still be there.

Fixes issue with not seeing clothes of people logging in while on a swoop.
  • Loading branch information...
apathyboy committed Mar 5, 2013
1 parent 4e5af1e commit 143d326133d56f5a78a0881c581410b3a3101924
Showing with 1 addition and 11 deletions.
  1. +1 −11 src/swganh_core/object/object.cc
@@ -403,11 +403,6 @@ void Object::__InternalAddAwareObject(std::shared_ptr<swganh::object::Object> ob
}
}
}
-
- if(GetPermissions()->canView(shared_from_this(), object))
- {
- reverse_still_valid = false;
- }
for(auto& slot : slot_descriptor_)
{
@@ -428,16 +423,11 @@ void Object::__InternalViewAwareObjects(std::function<void(std::shared_ptr<swgan
void Object::__InternalRemoveAwareObject(std::shared_ptr<swganh::object::Object> object, bool reverse_still_valid)
{
- if(GetPermissions()->canView(shared_from_this(), object))
- {
- reverse_still_valid = false;
- }
-
for(auto& slot : slot_descriptor_)
{
slot.second->view_objects([&] (const std::shared_ptr<Object>& v) {
v->__InternalRemoveAwareObject(object, reverse_still_valid);
- if(reverse_still_valid)
+ if(!reverse_still_valid)
{
object->__InternalRemoveAwareObject(v, reverse_still_valid);
}

0 comments on commit 143d326

Please sign in to comment.