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

Merge branch 'master' of github.com:HazimGazov/Inertia

Browse Source 
Conflicts:
	indra/newview/llviewermenu.cpp
This commit is contained in:
phr0z3nt04st
2010-06-09 00:59:47 -05:00
parent b1b36abe23 29ee9f7a08
commit 70e296e174
4 changed files with 314 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterexportregion.cpp
View File

@@ -19,8 +19,7 @@
LLFloaterExportRegion* LLFloaterExportRegion::sInstance = NULL; LLFloaterExportRegion* LLFloaterExportRegion::sInstance = NULL;
LLFloaterExportRegion::LLFloaterExportRegion() LLFloaterExportRegion::LLFloaterExportRegion(const LLSD& unused)
: LLFloater()
{ {
sInstance = this; sInstance = this;
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_export.xml"); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_export.xml");
@@ -54,11 +53,14 @@ void LLFloaterExportRegion::onClickSelectAll(void* user_data)
std::vector<LLScrollListItem*> items = list->getAllData(); std::vector<LLScrollListItem*> items = list->getAllData();
std::vector<LLScrollListItem*>::iterator item_iter = items.begin(); std::vector<LLScrollListItem*>::iterator item_iter = items.begin();
std::vector<LLScrollListItem*>::iterator items_end = items.end(); std::vector<LLScrollListItem*>::iterator items_end = items.end();
bool new_value = !((*item_iter)->getColumn(LIST_CHECKED)->getValue()); if(items.size())
for( ; item_iter != items_end; ++item_iter)
{ {
LLScrollListItem* item = (*item_iter); bool new_value = !((*item_iter)->getColumn(LIST_CHECKED)->getValue());
item->getColumn(LIST_CHECKED)->setValue(new_value); for( ; item_iter != items_end; ++item_iter)
{
LLScrollListItem* item = (*item_iter);
item->getColumn(LIST_CHECKED)->setValue(new_value);
}
} }
} }

5
indra/newview/llfloaterexportregion.h
View File

@@ -7,10 +7,11 @@
#include "llvoavatar.h" #include "llvoavatar.h"
class LLFloaterExportRegion class LLFloaterExportRegion
: public LLFloater : public LLFloater, public LLFloaterSingleton<LLFloaterExportRegion>
{ {
friend class LLUISingleton<LLFloaterExportRegion, VisibilityPolicy<LLFloater> >;
public: public:
LLFloaterExportRegion(); LLFloaterExportRegion(const LLSD& unused);
BOOL postBuild(void); BOOL postBuild(void);
void updateNamesProgress(); void updateNamesProgress();
void receivePrimName(LLViewerObject* object, std::string name); void receivePrimName(LLViewerObject* object, std::string name);

5
indra/newview/llviewermenu.cpp
View File

@@ -234,6 +234,7 @@
#include "llfloatermessagelog.h" #include "llfloatermessagelog.h"
#include "llfloatermessagebuilder.h" #include "llfloatermessagebuilder.h"
#include "llao.h" #include "llao.h"
#include "llfloaterexportregion.h"
// </edit> // </edit>
using namespace LLVOAvatarDefines; using namespace LLVOAvatarDefines;
@@ -5645,6 +5646,10 @@ class LLShowFloater : public view_listener_t
{ {
JCFloaterAreaSearch::toggle(); JCFloaterAreaSearch::toggle();
} }
else if (floater_name == "export region")
{
LLFloaterExportRegion::toggleInstance(LLSD());
}
else if (floater_name == "grid options") else if (floater_name == "grid options")
{ {
LLFloaterBuildOptions::show(NULL); LLFloaterBuildOptions::show(NULL);

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -539,6 +539,10 @@
mouse_opaque="true" name="Region/Estate..." width="185"> mouse_opaque="true" name="Region/Estate..." width="185">
<on_click function="ShowFloater" userdata="about region" /> <on_click function="ShowFloater" userdata="about region" />
</menu_item_call> </menu_item_call>
<menu_item_call bottom="-308" enabled="true" height="19" label="Export Region" left="0"
mouse_opaque="true" name="Export Region" width="185">
<on_click function="ShowFloater" userdata="export region" />
</menu_item_call>
<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0" <menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator6" width="185" /> mouse_opaque="true" name="separator6" width="185" />
<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true" <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"