more work done on copybootch function, save as xml works for the most part now
This commit is contained in:
@@ -217,6 +217,10 @@ public:
|
|||||||
|
|
||||||
virtual void saveAs() {}
|
virtual void saveAs() {}
|
||||||
|
|
||||||
|
// <edit>
|
||||||
|
virtual LLUUID getItemID() { return LLUUID::null; }
|
||||||
|
// </edit>
|
||||||
|
|
||||||
void setSnapTarget(LLHandle<LLFloater> handle) { mSnappedTo = handle; }
|
void setSnapTarget(LLHandle<LLFloater> handle) { mSnappedTo = handle; }
|
||||||
void clearSnapTarget() { mSnappedTo.markDead(); }
|
void clearSnapTarget() { mSnappedTo.markDead(); }
|
||||||
LLHandle<LLFloater> getSnapTarget() const { return mSnappedTo; }
|
LLHandle<LLFloater> getSnapTarget() const { return mSnappedTo; }
|
||||||
|
|||||||
@@ -3012,6 +3012,38 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// <edit>
|
||||||
|
|
||||||
|
void handle_reopen_with_hex_editor(void*)
|
||||||
|
{
|
||||||
|
LLFloater* top = gFloaterView->getFrontmost();
|
||||||
|
if (top)
|
||||||
|
{
|
||||||
|
LLUUID item_id = top->getItemID();
|
||||||
|
if(item_id.notNull())
|
||||||
|
{
|
||||||
|
LLInventoryItem* item = gInventory.getItem(item_id);
|
||||||
|
if(item)
|
||||||
|
{
|
||||||
|
DOFloaterHex::show(item_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_close_all_notifications(void*)
|
||||||
|
{
|
||||||
|
LLView::child_list_t child_list(*(gNotifyBoxView->getChildList()));
|
||||||
|
for(LLView::child_list_iter_t iter = child_list.begin();
|
||||||
|
iter != child_list.end();
|
||||||
|
iter++)
|
||||||
|
{
|
||||||
|
gNotifyBoxView->removeChild(*iter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// </edit>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
class LLHaveCallingcard : public LLInventoryCollectFunctor
|
class LLHaveCallingcard : public LLInventoryCollectFunctor
|
||||||
{
|
{
|
||||||
|
|||||||
27
indra/newview/skins/default/xui/en-us/floater_export.xml
Normal file
27
indra/newview/skins/default/xui/en-us/floater_export.xml
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||||
|
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
|
||||||
|
can_resize="true" height="400" width="310" min_width="310" min_height="200"
|
||||||
|
name="floater_export" title="Export...">
|
||||||
|
<scroll_list bottom="76" can_resize="true" column_padding="0" draw_heading="false"
|
||||||
|
follows="left|top|bottom|right" left="10" multi_select="true"
|
||||||
|
name="export_list" right="-10" search_column="2" top="-25">
|
||||||
|
<column name="checked" width="20" />
|
||||||
|
<column name="type" width="20" />
|
||||||
|
<column dynamicwidth="true" label="Name" name="name" />
|
||||||
|
<column name="avatarid" visible="false" />
|
||||||
|
</scroll_list>
|
||||||
|
<text bottom="50" left="10" width="100" height="20">Select/Deselect:</text>
|
||||||
|
<button bottom="52" follows="bottom|left" height="20" label="All"
|
||||||
|
left="110" name="select_all_btn" width="40" />
|
||||||
|
<button bottom="52" follows="bottom|left" height="20" label="Objects"
|
||||||
|
left_delta="42" name="select_objects_btn" width="64" />
|
||||||
|
<button bottom="52" follows="bottom|left" height="20" label="Wearables"
|
||||||
|
left_delta="66" name="select_wearables_btn" width="80" />
|
||||||
|
|
||||||
|
<text bottom="25" left="10" width="250" height="20" name="names_progress_text"></text>
|
||||||
|
|
||||||
|
<button bottom="8" follows="bottom|left" height="20" label="Save As..."
|
||||||
|
left="10" width="142" name="save_as_btn" />
|
||||||
|
<button bottom="8" follows="bottom|left" height="20" label="Make Copy"
|
||||||
|
left="158" width="142" name="make_copy_btn" />
|
||||||
|
</floater>
|
||||||
@@ -19,8 +19,10 @@
|
|||||||
<on_click function="Attachment.Detach" />
|
<on_click function="Attachment.Detach" />
|
||||||
<on_enable function="Attachment.EnableDetach" />
|
<on_enable function="Attachment.EnableDetach" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
|
<menu_item_call enabled="false" hidden="false" label="Save As..." mouse_opaque="true"
|
||||||
<on_click function="ShowFloater" userdata="gestures" />
|
name="Save As...">
|
||||||
|
<on_click function="Object.SaveAs" />
|
||||||
|
<on_enable function="Object.EnableSaveAs" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
<menu_item_call enabled="true" label="Appearance..." name="Appearance...">
|
<menu_item_call enabled="true" label="Appearance..." name="Appearance...">
|
||||||
<on_click function="ShowFloater" userdata="appearance" />
|
<on_click function="ShowFloater" userdata="appearance" />
|
||||||
|
|||||||
@@ -32,7 +32,11 @@
|
|||||||
<menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
|
<menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
|
||||||
<on_click function="Avatar.InviteToGroup" />
|
<on_click function="Avatar.InviteToGroup" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
<menu_item_separator />
|
<menu_item_call enabled="false" hidden="false" label="Save As..." mouse_opaque="true"
|
||||||
|
name="Save As...">
|
||||||
|
<on_click function="Object.SaveAs" />
|
||||||
|
<on_enable function="Object.EnableSaveAs" />
|
||||||
|
</menu_item_call>
|
||||||
<menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
|
<menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
|
||||||
<on_click function="Avatar.Eject" />
|
<on_click function="Avatar.Eject" />
|
||||||
<on_enable function="Avatar.EnableFreezeEject" />
|
<on_enable function="Avatar.EnableFreezeEject" />
|
||||||
|
|||||||
@@ -51,8 +51,16 @@
|
|||||||
<on_click function="Object.ReportAbuse" />
|
<on_click function="Object.ReportAbuse" />
|
||||||
<on_enable function="Object.EnableReportAbuse" />
|
<on_enable function="Object.EnableReportAbuse" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
<menu_item_separator />
|
<menu_item_call enabled="false" hidden="false" label="Save As..." mouse_opaque="true"
|
||||||
<menu_item_separator />
|
name="Save As...">
|
||||||
|
<on_click function="Object.SaveAs" />
|
||||||
|
<on_enable function="Object.EnableSaveAs" />
|
||||||
|
</menu_item_call>
|
||||||
|
<menu_item_call enabled="false" hidden="false" label="Import..." mouse_opaque="true"
|
||||||
|
name="Import...">
|
||||||
|
<on_click function="Object.Import" />
|
||||||
|
<on_enable function="Object.EnableImport" />
|
||||||
|
</menu_item_call>
|
||||||
<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
|
<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
|
||||||
<on_click function="Object.Mute" />
|
<on_click function="Object.Mute" />
|
||||||
<on_enable function="Object.EnableMute" />
|
<on_enable function="Object.EnableMute" />
|
||||||
|
|||||||
@@ -29,6 +29,12 @@
|
|||||||
mouse_opaque="true" enabled="true" >
|
mouse_opaque="true" enabled="true" >
|
||||||
<on_click function="File.UploadBulk" userdata="" />
|
<on_click function="File.UploadBulk" userdata="" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
|
<menu_item_call bottom="-86" enabled="true" height="19"
|
||||||
|
label="Import XML..." left="0" mouse_opaque="true"
|
||||||
|
name="Import XML" width="243">
|
||||||
|
<on_click function="File.ImportXML" userdata="" />
|
||||||
|
<on_enable function ="File.EnableImportXML" userdata="" />
|
||||||
|
</menu_item_call>
|
||||||
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
|
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
|
||||||
<menu_item_call enabled="true" label="Set Default Permissions..."
|
<menu_item_call enabled="true" label="Set Default Permissions..."
|
||||||
mouse_opaque="true" name="perm prefs" >
|
mouse_opaque="true" name="perm prefs" >
|
||||||
@@ -732,6 +738,12 @@
|
|||||||
<on_click function="Tools.SaveToObjectInventory" userdata="" />
|
<on_click function="Tools.SaveToObjectInventory" userdata="" />
|
||||||
<on_enable function="Tools.EnableSaveToObjectInventory" />
|
<on_enable function="Tools.EnableSaveToObjectInventory" />
|
||||||
</menu_item_call>
|
</menu_item_call>
|
||||||
|
<menu_item_call bottom="-403" enabled="false" height="19"
|
||||||
|
label="Admin Delete" left="0" mouse_opaque="true"
|
||||||
|
name="Admin Delete" width="250" shortcut="control|alt|shift|Del">
|
||||||
|
<on_click function="Tools.AdminDelete" userdata="" />
|
||||||
|
<on_enable function="Tools.EnableAdminDelete" />
|
||||||
|
</menu_item_call>
|
||||||
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
|
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
|
||||||
mouse_opaque="true" name="separator6" width="250" />
|
mouse_opaque="true" name="separator6" width="250" />
|
||||||
<menu_item_call bottom="-430" enabled="true" height="19"
|
<menu_item_call bottom="-430" enabled="true" height="19"
|
||||||
|
|||||||
Reference in New Issue
Block a user