diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/collision/Management/IVMapManager.h | |
parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/collision/Management/IVMapManager.h')
-rwxr-xr-x | src/server/collision/Management/IVMapManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h index a645e88ef05..7cf296625f4 100755 --- a/src/server/collision/Management/IVMapManager.h +++ b/src/server/collision/Management/IVMapManager.h @@ -35,7 +35,7 @@ namespace VMAP { VMAP_LOAD_RESULT_ERROR, VMAP_LOAD_RESULT_OK, - VMAP_LOAD_RESULT_IGNORED, + VMAP_LOAD_RESULT_IGNORED }; #define VMAP_INVALID_HEIGHT -100000.0f // for check |