diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-26 20:26:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-26 20:26:36 -0400 |
| commit | a99941a7fd55ad56144793957792cdb8bb0e5df6 (patch) | |
| tree | 13fd8b6717f3d668f117957a136de33c9753ca44 /indra/newview/llwldaycycle.h | |
| parent | 01ec64a1bc88ed0b1a18c559c136b32476309100 (diff) | |
| parent | 6bc23e1be7e055b4f80f5c5de9dcd186a92a21a4 (diff) | |
merge changes for latest windlight integration project repo
Diffstat (limited to 'indra/newview/llwldaycycle.h')
| -rw-r--r-- | indra/newview/llwldaycycle.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llwldaycycle.h b/indra/newview/llwldaycycle.h index 36b5160a58..56bd66f114 100644 --- a/indra/newview/llwldaycycle.h +++ b/indra/newview/llwldaycycle.h @@ -68,6 +68,9 @@ public: /// load the LLSD data from a file (returns the undefined LLSD if not found) static LLSD loadCycleDataFromFile(const std::string & fileName); + /// load the LLSD data from a file specified by full path + static LLSD loadDayCycleFromPath(const std::string& file_path); + /// get the LLSD data for this day cycle LLSD asLLSD(); |