The following commit has been merged in the master branch:
commit 65bb03f78026a240bb0b86c565064a8829e704da
Author: Robin Cornelius <[EMAIL PROTECTED]>
Date: Fri Jul 18 22:30:26 2008 +0100
Add in new patches for windlight settings
diff --git
a/debian/patches/VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
b/debian/patches/VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
index 5e8637e..f2e4158 100644
--- a/debian/patches/VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
+++ b/debian/patches/VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
@@ -15,13 +15,13 @@ index 1eb0654..cc8ce60 100644
LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir().c_str());
+ //good as place as any to create user windlight directories
-+ std::string
user_windlight_skies_path_name(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/skies", ""));
++ std::string
user_windlight_skies_path_name(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/skies", ""));
+ LLFile::mkdir(user_windlight_skies_path_name.c_str());
+
-+ std::string
user_windlight_water_path_name(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/water", ""));
++ std::string
user_windlight_water_path_name(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/water", ""));
+ LLFile::mkdir(user_windlight_water_path_name.c_str());
+
-+ std::string
user_windlight_days_path_name(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/days", ""));
++ std::string
user_windlight_days_path_name(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/days", ""));
+ LLFile::mkdir(user_windlight_days_path_name.c_str());
+
+
@@ -77,7 +77,7 @@ index fb09fd8..a11b575 100644
+
+ // And repeat for user presets, note the user presets will modify any
system presets already loaded
+
-+ LLString
path_name2(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/water", ""));
++ LLString path_name2(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/water", ""));
+ LL_INFOS2("AppInit", "Shaders") << "Loading User water settings from "
<< path_name2 << LL_ENDL;
- std::ifstream water_xml(cur_path.c_str());
@@ -128,7 +128,7 @@ index fb09fd8..a11b575 100644
+ // That failed, try loading from the users area instead.
+ if(!presetsXML)
+ {
-+ pathName=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/water", escaped_filename);
++ pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS
, "windlight/water", escaped_filename);
+ llinfos << "Loading User water setting from " << pathName <<
llendl;
+ presetsXML.open(pathName.c_str());
+ }
@@ -157,7 +157,7 @@ index fb09fd8..a11b575 100644
// make an empty llsd
LLSD paramsData(LLSD::emptyMap());
- std::string
pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight/water", escaped_filename));
-+ std::string
pathName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/water", escaped_filename));
++ std::string pathName(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename));
// fill it with LLSD windlight params
paramsData = mParamList[name].getAll();
@@ -166,7 +166,7 @@ index fb09fd8..a11b575 100644
if(delete_from_disk)
{
- LLString
path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight/water", ""));
-+ LLString
path_name(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/water", ""));
++ LLString path_name(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/water", ""));
// use full curl escaped name
char * curl_str = curl_escape(name.c_str(), name.size());
@@ -183,55 +183,6 @@ index 6c9ce3e..62f23d9 100644
/// save the parameter presets to file
void savePreset(const LLString & name);
-diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
-index 4626160..cc0222e 100644
---- a/indra/newview/llwldaycycle.cpp
-+++ b/indra/newview/llwldaycycle.cpp
-@@ -50,15 +50,32 @@ LLWLDayCycle::~LLWLDayCycle()
-
- void LLWLDayCycle::loadDayCycle(const LLString & fileName)
- {
-+
-+ // Currently the day cycle only loads in Default.xml and has no
provision to
-+ // allow different filenames to be provided, so first see if we have a
user customised
-+ // Default.xml and if that fails open the system default one. reverse
logic to water
-+ // and skies
-+
- // clear the first few things
- mTimeMap.clear();
-
- // now load the file
-- LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
-+ LLString
pathName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
- "windlight/days", fileName));
-- llinfos << "Loading DayCycle settings from " << pathName << llendl;
-+ llinfos << "Loading User DayCycle settings from " << pathName << llendl;
-
-- llifstream day_cycle_xml(pathName.c_str());
-+ llifstream day_cycle_xml;
-+ day_cycle_xml.open(pathName.c_str());
-+
-+ if(!day_cycle_xml)
-+ {
-+ LLString
pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
-+ "windlight/days", fileName));
-+ llinfos << "Loading Default DayCycle settings from " <<
pathName << llendl;
-+ day_cycle_xml.open(pathName.c_str());
-+ }
-+
-+
- if (day_cycle_xml.is_open())
- {
- // load and parse it
-@@ -100,7 +117,7 @@ void LLWLDayCycle::saveDayCycle(const LLString & fileName)
- {
- LLSD day_data(LLSD::emptyArray());
-
-- LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight/days", fileName));
-+ LLString
pathName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/days", fileName));
- //llinfos << "Saving WindLight settings to " << pathName << llendl;
-
- for(std::map<F32, std::string>::const_iterator mIt = mTimeMap.begin();
diff --git a/indra/newview/llwlparammanager.cpp
b/indra/newview/llwlparammanager.cpp
index 9f23b37..0b63ecb 100644
--- a/indra/newview/llwlparammanager.cpp
@@ -288,7 +239,7 @@ index 9f23b37..0b63ecb 100644
+
+ // And repeat for user presets, note the user presets will modify any
system presets already loaded
+
-+ LLString
path_name2(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/skies", ""));
++ LLString path_name2(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/skies", ""));
+ LL_INFOS2("AppInit", "Shaders") << "Loading User WindLight settings
from " << path_name2 << LL_ENDL;
+
+ found = true;
@@ -356,7 +307,7 @@ index 9f23b37..0b63ecb 100644
LLSD paramsData(LLSD::emptyMap());
- LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight", fileName));
-+ LLString
pathName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "windlight",
fileName));
++ LLString pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS
, "windlight", fileName));
for(std::map<std::string, LLWLParamSet>::iterator mIt =
mParamList.begin();
mIt != mParamList.end();
@@ -382,7 +333,7 @@ index 9f23b37..0b63ecb 100644
+ // That failed, try loading from the users area instead.
+ if(!presetsXML)
+ {
-+ pathName=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/skies", escaped_filename);
++ pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS
, "windlight/skies", escaped_filename);
+ llinfos << "Loading User WindLight sky setting from " <<
pathName << llendl;
+ presetsXML.open(pathName.c_str());
+ }
@@ -412,7 +363,7 @@ index 9f23b37..0b63ecb 100644
// make an empty llsd
LLSD paramsData(LLSD::emptyMap());
- std::string
pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight/skies", escaped_filename));
-+ std::string
pathName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/skies", escaped_filename));
++ std::string pathName(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename));
// fill it with LLSD windlight params
paramsData = mParamList[name].getAll();
@@ -421,7 +372,7 @@ index 9f23b37..0b63ecb 100644
if(delete_from_disk)
{
- LLString
path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
"windlight/skies", ""));
-+ LLString
path_name(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
"windlight/skies", ""));
++ LLString path_name(gDirUtilp->getExpandedFilename(
LL_PATH_USER_SETTINGS , "windlight/skies", ""));
// use full curl escaped name
char * curl_str = curl_escape(name.c_str(), name.size());
diff --git a/debian/patches/VWR-5917_multiple_user_day_cycles_in_rw_area.dpatch
b/debian/patches/VWR-5917_multiple_user_day_cycles_in_rw_area.dpatch
old mode 100755
new mode 100644
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and
OpenSim grids
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
