Skip to content

Commit

Permalink
These checks appear to be having the opposite effect of keeping thing…
Browse files Browse the repository at this point in the history
…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 143d326
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/swganh_core/object/object.cc
Expand Up @@ -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_)
{
Expand All @@ -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);
}
Expand Down

0 comments on commit 143d326

Please sign in to comment.