livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

meow-7.2.2
Nicky 2015-09-28 00:20:10 +02:00
parent ec008bda22 56411b6c49
commit cea475f778
2 changed files with 163 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
indra/newview/chatbar_as_cmdline.cpp
View File

@ -178,9 +178,10 @@ void doZdCleanup()
enum EZtakeState
{
ZTS_COUNTDOWN = 0,
ZRS_TAKING = 1,
ZTS_DROP = 2,
ZTS_DONE = 3
ZTS_SELECTION = 1,
ZTS_TAKE = 2,
ZTS_DROP = 3,
ZTS_DONE = 4
};
void doZtCleanup();
@ -189,7 +190,7 @@ class JCZtake : public LLEventTimer
public:
BOOL mRunning;
JCZtake(const LLUUID& target, bool package = false, LLUUID destination = LLUUID::null, std::string dtarget = "", EDeRezDestination dest = DRD_TAKE_INTO_AGENT_INVENTORY) :
JCZtake(const LLUUID& target, bool package = false, LLUUID destination = LLUUID::null, std::string dtarget = "", EDeRezDestination dest = DRD_TAKE_INTO_AGENT_INVENTORY, bool use_selection = true, std::vector<U32> to_take = std::vector<U32>()) :
LLEventTimer(0.66f),
mTarget(target),
mRunning(FALSE),
@ -197,10 +198,20 @@ public:
mPackage(package),
mPackageDest(destination),
mDest(dest),
mPackSize(0),
mState(ZTS_COUNTDOWN)
mToTake(to_take),
mPackSize(0)
{
if (use_selection)
{
mState = ZTS_COUNTDOWN;
}
else
{
mState = ZTS_TAKE;
}
mFolderName = dtarget;
if (mPackage)
{
reportToNearbyChat("Packager started. Phase 1 (taking in-world objects into inventory) starting in: ");
@ -225,10 +236,10 @@ public:
switch (mState) {
case ZTS_COUNTDOWN:
reportToNearbyChat(llformat("%i...", mCountdown--));
if (mCountdown == 0) mState = ZRS_TAKING;
if (mCountdown == 0) mState = ZTS_SELECTION;
break;
case ZRS_TAKING:
case ZTS_SELECTION:
for (LLObjectSelection::root_iterator itr = LLSelectMgr::getInstance()->getSelection()->root_begin();
itr != LLSelectMgr::getInstance()->getSelection()->root_end(); ++itr)
{
@ -241,7 +252,10 @@ public:
mToTake.push_back(localid);
}
}
if (mToTake.size() > 0) mState = ZTS_TAKE;
break;
case ZTS_TAKE:
if (mToTake.size() > 0)
{
std::vector<LLPointer<LLViewerInventoryItem> > inventory = findInventoryInFolder(mFolderName);
@ -272,9 +286,18 @@ public:
{
if (mPackage)
{
mPeriod = 1.0f;
mCountdown = 45; //reused for a basic timeout
mState = ZTS_DROP;
if (mPackageDest != LLUUID::null)
{
mPeriod = 1.0f;
mCountdown = 45; //reused for a basic timeout
mState = ZTS_DROP;
}
else
{
reportToNearbyChat("Ktake has taken all selected objects.");
doZtCleanup();
mState = ZTS_DONE;
}
}
else
{
@ -294,6 +317,17 @@ public:
}
}
}
else
{
if (mPackage)
{
reportToNearbyChat(llformat("Packager: no objects to take."));
}
else
{
reportToNearbyChat(llformat("Ztake: no objects to take."));
}
}
break;
case ZTS_DROP:
@ -1114,7 +1148,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
}
return false;
}
else if (command == "lpackage")
else if (command == "lpackage" || command == "cpackage")
{
std::string destination;
if (i >> destination)
@ -1143,7 +1177,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
if (folder.notNull())
{
reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str()));
ztake = new JCZtake(folder, true, LLUUID(destination), folder_name);
ztake = new JCZtake(folder, true, LLUUID(destination), folder_name, (command == "cpackage") ? DRD_ACQUIRE_TO_AGENT_INVENTORY : DRD_TAKE_INTO_AGENT_INVENTORY);
}
else
{
@ -1163,7 +1197,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
}
return false;
}
else if (command == "cpackage")
else if (command == "kpackage")
{
std::string destination;
if (i >> destination)
@ -1180,30 +1214,64 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
else
{
std::string folder_name;
std::string tmp;
while (i >> tmp)
if (i >> folder_name)
{
folder_name = folder_name + tmp + " ";
}
try
{
folder_name = folder_name.substr(0, folder_name.length() - 1);
LLUUID folder = gInventory.findCategoryByName(folder_name);
if (folder.notNull())
try
{
reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str()));
ztake = new JCZtake(folder, true, LLUUID(destination), folder_name, DRD_ACQUIRE_TO_AGENT_INVENTORY);
LLUUID folder = gInventory.findCategoryByName(folder_name);
if (folder.notNull())
{
std::vector<U32> to_take;
std::string take;
while (i >> take)
{
if (!LLUUID::validate(take))
{
reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)");
return false;
}
else
{
LLViewerObject* objectp = gObjectList.findObject(LLUUID(take));
if(!objectp)
{
reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct.");
return false;
}
else
{
U32 localid = objectp->getLocalID();
if (std::find(to_take.begin(), to_take.end(), localid) == to_take.end())
{
to_take.push_back(localid);
}
}
}
}
if (to_take.empty())
{
reportToNearbyChat("No objects to take.");
}
else
{
reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str()));
ztake = new JCZtake(folder, true, LLUUID(destination), folder_name, DRD_ACQUIRE_TO_AGENT_INVENTORY, false, to_take);
}
}
else
{
reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str()));
reportToNearbyChat("The packager cannot work if the folder is inside another folder.");
}
}
else
catch (std::out_of_range)
{
reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str()));
reportToNearbyChat("The packager cannot work if the folder is inside another folder.");
reportToNearbyChat("Please specify a destination folder in your inventory.");
}
}
catch (std::out_of_range)
{
reportToNearbyChat("Please specify a destination folder in your inventory.");
}
}
}
else
@ -1212,6 +1280,69 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
}
return false;
}
else if (command == "ktake" || command == "kcopy")
{
std::string folder_name;
if (i >> folder_name)
{
try
{
LLUUID folder = gInventory.findCategoryByName(folder_name);
if (folder.notNull())
{
std::vector<U32> to_take;
std::string take;
while (i >> take)
{
if (!LLUUID::validate(take))
{
reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)");
return false;
}
else
{
LLViewerObject* objectp = gObjectList.findObject(LLUUID(take));
if(!objectp)
{
reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct.");
return false;
}
else
{
U32 localid = objectp->getLocalID();
if (std::find(to_take.begin(), to_take.end(), localid) == to_take.end())
{
to_take.push_back(localid);
}
}
}
}
if (to_take.empty())
{
reportToNearbyChat("No objects to take.");
}
else
{
reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str()));
ztake = new JCZtake(folder, true, LLUUID::null, folder_name, (command == "kcopy") ? DRD_ACQUIRE_TO_AGENT_INVENTORY : DRD_TAKE_INTO_AGENT_INVENTORY, false, to_take);
}
}
else
{
reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str()));
reportToNearbyChat("The packager cannot work if the folder is inside another folder.");
}
}
catch (std::out_of_range)
{
reportToNearbyChat("Please specify a destination folder in your inventory.");
}
}
return false;
}
else if (command == "mtake")
{
std::string setting;

1
indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
positioning="cascading"
ignore_ui_scale="false"
legacy_header_height="18"
can_minimize="true"
can_close="true"