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

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
This commit is contained in:
Siana Gearz
2012-08-09 00:42:23 +02:00
parent f3e7340118 1a6c00ca8b
commit de74443d76
74 changed files with 5078 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerwindow.cpp
View File

@@ -131,6 +131,7 @@
#include "llmodaldialog.h"
#include "llmorphview.h"
#include "llmoveview.h"
#include "llpanelpathfindingrebakenavmesh.h"
#include "llnotify.h"
#include "lloverlaybar.h"
#include "llpreviewtexture.h"
@@ -1958,6 +1959,10 @@ void LLViewerWindow::initWorldUI()
// put behind everything else in the UI
mRootView->addChildInBack(gHUDView);
}
LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("state_management_buttons_container");
LLPanelPathfindingRebakeNavmesh *panel_rebake_navmesh = LLPanelPathfindingRebakeNavmesh::getInstance();
panel_ssf_container->addChild(panel_rebake_navmesh);
}
// initWorldUI that wasn't before logging in. Some of this may require the access the 'LindenUserDir'.
@@ -3428,8 +3433,11 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
{
LLSelectNode* nodep = *iter;
LLViewerObject* object = nodep->getObject();
LLViewerObject *root_object = (object == NULL) ? NULL : object->getRootEdit();
BOOL this_object_movable = FALSE;
if (object->permMove() && (object->permModify() || selecting_linked_set))
if (object->permMove() && !object->isPermanentEnforced() &&
((root_object == NULL) || !root_object->isPermanentEnforced()) &&
(object->permModify() || selecting_linked_set))
{
moveable_object_selected = TRUE;
this_object_movable = TRUE;