diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/llvoavatar.cpp | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 49d786d..2345bf6 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
| @@ -1496,8 +1496,16 @@ LLPartSysData LLVOAvatar::sCloud; | |||
| 1496 | void LLVOAvatar::initCloud() | 1496 | void LLVOAvatar::initCloud() |
| 1497 | { | 1497 | { |
| 1498 | // fancy particle cloud designed by Brent | 1498 | // fancy particle cloud designed by Brent |
| 1499 | std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml"); | ||
| 1500 | if(!gDirUtilp->fileExists(filename)) | ||
| 1501 | { | ||
| 1502 | filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "cloud.xml"); | ||
| 1503 | } | ||
| 1504 | if(!gDirUtilp->fileExists(filename)) | ||
| 1505 | { | ||
| 1506 | filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml"); | ||
| 1507 | } | ||
| 1499 | 1508 | ||
| 1500 | std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml"); | ||
| 1501 | LLSD cloud; | 1509 | LLSD cloud; |
| 1502 | llifstream in_file(filename); | 1510 | llifstream in_file(filename); |
| 1503 | LLSDSerialize::fromXMLDocument(cloud, in_file); | 1511 | LLSDSerialize::fromXMLDocument(cloud, in_file); |