diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
| commit | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch) | |
| tree | 60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/llworld.h | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
| parent | 235980dfe3f5683c7871285888001740c1c5d66f (diff) | |
STORM-416 : merge with viewer-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); |