Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-07 20:11:18 +01:00
parent 5e7acb9f3a
commit da19e770a2
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/plugins/filepicker/basic_plugin_filepicker.cpp
View File

@@ -88,8 +88,8 @@ static LLFilePicker::ESaveFilter str2savefilter(std::string const& filter)
return LLFilePicker::FFSAVE_PNG;
else if (filter == "jpeg")
return LLFilePicker::FFSAVE_JPEG;
else if (filter == "lsl")
return LLFilePicker::FFSAVE_LSL;
else if (filter == "script")
return LLFilePicker::FFSAVE_SCRIPT;
else if (filter == "animatn")
return LLFilePicker::FFSAVE_ANIMATN;
else if (filter == "ogg")
@@ -161,8 +161,8 @@ static LLFilePicker::ELoadFilter str2loadfilter(std::string const& filter)
return LLFilePicker::FFLOAD_MODEL;
else if (filter == "collada")
return LLFilePicker::FFLOAD_COLLADA;
else if (filter == "lsl")
return LLFilePicker::FFLOAD_LSL;
else if (filter == "script")
return LLFilePicker::FFLOAD_SCRIPT;
else if (filter == "dictionary")
return LLFilePicker::FFLOAD_DICTIONARY;
else if (filter == "invgz")

12
indra/plugins/filepicker/llfilepicker.cpp
View File

@@ -194,7 +194,7 @@ bool LLFilePickerBase::setupFilter(ELoadFilter filter)
mOFN.lpstrFilter = MODEL_FILTER \
L"\0";
break;
case FFLOAD_LSL:
case FFLOAD_SCRIPT:
mOFN.lpstrFilter = SCRIPT_FILTER \
L"\0";
break;
@@ -504,7 +504,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
L"Gestures (*.gesture)\0*.gesture\0" \
L"\0";
break;
case FFSAVE_LSL:
case FFSAVE_SCRIPT:
if(filename.empty())
{
wcsncpy( mFilesW,L"untitled.lsl", FILENAME_BUFFER_SIZE);
@@ -822,7 +822,7 @@ Boolean LLFilePickerBase::navOpenFilterProc(AEDesc *theItem, void *info, void *c
result = false;
}
}
else if (filter == FFLOAD_LSL)
else if (filter == FFLOAD_SCRIPT)
{
if (fileInfo.filetype != 'LSL ' &&
(fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("lsl"), kCFCompareCaseInsensitive) != kCFCompareEqualTo)) )
@@ -1030,7 +1030,7 @@ OSStatus LLFilePickerBase::doNavSaveDialog(ESaveFilter filter, std::string const
extension = CFSTR(".j2c");
break;
case FFSAVE_LSL:
case FFSAVE_SCRIPT:
type = 'LSL ';
creator = '\?\?\?\?';
extension = CFSTR(".lsl");
@@ -1489,7 +1489,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
LLTrans::getString("compressed_image_files") + " (*.j2c)");
suggest_ext = ".j2c";
break;
case FFSAVE_LSL:
case FFSAVE_SCRIPT:
caption += add_script_filter_to_gtkchooser(picker);
suggest_ext = ".lsl";
break;
@@ -1553,7 +1553,7 @@ bool LLFilePickerBase::getLoadFile(ELoadFilter filter, std::string const& folder
case FFLOAD_IMAGE:
filtername = add_imageload_filter_to_gtkchooser(picker);
break;
case FFLOAD_LSL:
case FFLOAD_SCRIPT:
filtername = add_script_filter_to_gtkchooser(picker);
break;
case FFLOAD_DICTIONARY:

4
indra/plugins/filepicker/llfilepicker.h
View File

@@ -62,7 +62,7 @@ public:
FFLOAD_RAW = 8,
FFLOAD_MODEL = 9,
FFLOAD_COLLADA = 10,
FFLOAD_LSL = 11,
FFLOAD_SCRIPT = 11,
FFLOAD_DICTIONARY = 12,
// <edit>
FFLOAD_INVGZ = 13,
@@ -88,7 +88,7 @@ public:
FFSAVE_J2C = 12,
FFSAVE_PNG = 13,
FFSAVE_JPEG = 14,
FFSAVE_LSL = 15,
FFSAVE_SCRIPT = 15,
// <edit>
FFSAVE_ANIMATN = 16,
FFSAVE_OGG = 17,