diff options
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 32cf1f3ca1..ed4717a4dc 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -97,6 +97,7 @@ #include "llpanelface.h" #include "llglheaders.h" #include "llinventoryobserver.h" +#include "llscripteditorws.h" LLViewerObject* getSelectedParentObject(LLViewerObject *object) ; // @@ -252,7 +253,6 @@ LLSelectMgr::LLSelectMgr() LLSelectMgr::~LLSelectMgr() { clearSelections(); - mSlectionLodModChangedConnection.disconnect(); } void LLSelectMgr::clearSelections() @@ -6108,6 +6108,11 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data node->mInventorySerial = inv_serial; node->mSitName.assign(sit_name); node->mTouchName.assign(touch_name); + + if (auto ws_server = LLScriptEditorWSServer::getServer()) + { + ws_server->onObjectPropertyChanged(id, name, desc, inv_serial); + } } } @@ -6204,6 +6209,11 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use } dialog_refresh_all(); + + if (auto ws_server = LLScriptEditorWSServer::getServer()) + { + ws_server->onObjectPropertyChanged(id, name, desc); + } } @@ -6624,7 +6634,7 @@ void LLSelectMgr::renderSilhouettes(bool for_hud) gGL.popMatrix(); gGL.popMatrix(); - //glLineWidth(1.f); + //gGL.setLineWidth(1.f); #if GL_VERSION_1_1 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); #endif |
