diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-12 14:07:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-12 14:07:12 -0400 |
| commit | 6a9d23b71aa7939a490d17f4c7d7046221d9f612 (patch) | |
| tree | ab20e47903c538fde692e4db63808792710c3669 | |
| parent | f70296ec68c9205bfa9ec295393584155b488e48 (diff) | |
| parent | 0142a0c6a9c05db10423b38beab2b2b356e5f85e (diff) | |
merge changes for open-189
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/llwindow/llwindowmacosx-objc.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 00202eec5e..d389c1ecfd 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1134,6 +1134,7 @@ Slee Mayo snowy Sidran Sovereign Engineer MAINT-2334 + OPEN-189 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 32b3bfb078..3b6295fba8 100755 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -25,6 +25,9 @@ * $/LicenseInfo$ */ +#ifndef LL_LLWINDOWMACOSX_OBJC_H +#define LL_LLWINDOWMACOSX_OBJC_H + #include <map> #include <vector> @@ -143,3 +146,5 @@ NSWindowRef getMainAppWindow(); GLViewRef getGLView(); unsigned int getModifiers(); + +#endif // LL_LLWINDOWMACOSX_OBJC_H |