diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
| commit | b657516f72f016a918e0ff627105dd380a94394c (patch) | |
| tree | 7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llworld.h | |
| parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
| parent | c446062bd3bd3f172b20f22f2086cea962fb7278 (diff) | |
pull beta changes back to development
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 4465fde210..c60dc8dc29 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -137,6 +137,7 @@ public: LLViewerTexture *getDefaultWaterTexture(); void updateWaterObjects(); + void waterHeightRegionInfo(std::string const& sim_name, F32 water_height); void shiftRegions(const LLVector3& offset); void setSpaceTimeUSec(const U64 space_time_usec); |