aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llpanel.cpp1
-rw-r--r--linden/indra/llui/llprogressbar.cpp3
-rw-r--r--linden/indra/newview/chatbar_as_cmdline.cpp1
-rw-r--r--linden/indra/newview/llmaniprotate.cpp1
-rw-r--r--linden/indra/newview/llpanelpermissions.cpp5
-rw-r--r--linden/indra/newview/llselectmgr.cpp2
-rw-r--r--linden/indra/newview/llspatialpartition.cpp3
-rw-r--r--linden/indra/newview/llsurface.cpp2
-rw-r--r--linden/indra/newview/llviewercamera.cpp3
-rw-r--r--linden/indra/newview/llviewerdisplay.cpp1
-rw-r--r--linden/indra/newview/llviewerparcelmedia.cpp6
11 files changed, 5 insertions, 23 deletions
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 07e78ed..361e4f3 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -1078,7 +1078,6 @@ struct LLLayoutStack::LLEmbeddedPanel
1078 mVisibleAmt(1.f) // default to fully visible 1078 mVisibleAmt(1.f) // default to fully visible
1079 { 1079 {
1080 LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; 1080 LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
1081 LLRect resize_bar_rect = panelp->getRect();
1082 1081
1083 S32 min_dim; 1082 S32 min_dim;
1084 if (orientation == HORIZONTAL) 1083 if (orientation == HORIZONTAL)
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp
index d148733..0000d77 100644
--- a/linden/indra/llui/llprogressbar.cpp
+++ b/linden/indra/llui/llprogressbar.cpp
@@ -83,9 +83,6 @@ void LLProgressBar::draw()
83 bar_bg_imagep->draw(getLocalRect(), 83 bar_bg_imagep->draw(getLocalRect(),
84 background_color); 84 background_color);
85 85
86 F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
87 LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor");
88 bar_color.mV[3] = alpha;
89 LLRect progress_rect = getLocalRect(); 86 LLRect progress_rect = getLocalRect();
90 progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f)); 87 progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
91 bar_fg_imagep->draw(progress_rect); 88 bar_fg_imagep->draw(progress_rect);
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 9777114..e1314f7 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -302,7 +302,6 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
302 { 302 {
303 if (i >> z) 303 if (i >> z)
304 { 304 {
305 LLVector3 agentPos = gAgent.getPositionAgent();
306 LLViewerRegion* agentRegionp = gAgent.getRegion(); 305 LLViewerRegion* agentRegionp = gAgent.getRegion();
307 if(agentRegionp) 306 if(agentRegionp)
308 { 307 {
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 77c8bd5..fa5ab56 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -1652,7 +1652,6 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
1652 return; 1652 return;
1653 } 1653 }
1654 1654
1655 LLQuaternion object_rot = first_object->getRenderRotation();
1656 LLVector3 rotation_center = gAgent.getPosAgentFromGlobal(mRotationCenter); 1655 LLVector3 rotation_center = gAgent.getPosAgentFromGlobal(mRotationCenter);
1657 LLVector3 mouse_dir_x; 1656 LLVector3 mouse_dir_x;
1658 LLVector3 mouse_dir_y; 1657 LLVector3 mouse_dir_y;
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 6b7bc1b..9799de7 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -541,7 +541,7 @@ void LLPanelPermissions::refresh()
541 // TODO: Creator permissions 541 // TODO: Creator permissions
542 542
543 BOOL valid_base_perms = FALSE; 543 BOOL valid_base_perms = FALSE;
544 BOOL valid_owner_perms = FALSE; 544 //BOOL valid_owner_perms = FALSE;
545 BOOL valid_group_perms = FALSE; 545 BOOL valid_group_perms = FALSE;
546 BOOL valid_everyone_perms = FALSE; 546 BOOL valid_everyone_perms = FALSE;
547 BOOL valid_next_perms = FALSE; 547 BOOL valid_next_perms = FALSE;
@@ -561,7 +561,8 @@ void LLPanelPermissions::refresh()
561 &base_mask_on, 561 &base_mask_on,
562 &base_mask_off); 562 &base_mask_off);
563 563
564 valid_owner_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER, 564 // TODO - seems odd, but this is not actually used, except to set owner_mask_*.
565 /*valid_owner_perms =*/ LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
565 &owner_mask_on, 566 &owner_mask_on,
566 &owner_mask_off); 567 &owner_mask_off);
567 568
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 4a6c8ed..bfe0e9c 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1072,7 +1072,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
1072 if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount()) 1072 if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount())
1073 { 1073 {
1074 //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject()); 1074 //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject());
1075 LLBBox bbox = mSavedSelectionBBox;
1076 mGridOrigin = mSavedSelectionBBox.getCenterAgent(); 1075 mGridOrigin = mSavedSelectionBBox.getCenterAgent();
1077 mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f; 1076 mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f;
1078 1077
@@ -1090,7 +1089,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
1090 else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) 1089 else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull())
1091 { 1090 {
1092 mGridRotation = first_grid_object->getRenderRotation(); 1091 mGridRotation = first_grid_object->getRenderRotation();
1093 LLVector3 first_grid_obj_pos = first_grid_object->getRenderPosition();
1094 1092
1095 LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX); 1093 LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX);
1096 LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX); 1094 LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX);
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 30f7c0b..a9255b3 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -2617,9 +2617,6 @@ public:
2617 return; 2617 return;
2618 } 2618 }
2619 2619
2620 LLVector3 nodeCenter = group->mBounds[0];
2621 LLVector3 octCenter = LLVector3(group->mOctreeNode->getCenter());
2622
2623 for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i) 2620 for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
2624 { 2621 {
2625 LLDrawable* drawable = *i; 2622 LLDrawable* drawable = *i;
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 5a99e66..8692c80 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -1262,8 +1262,6 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y,
1262 y_end = tex_width; 1262 y_end = tex_width;
1263 } 1263 }
1264 1264
1265 LLVector3d origin_global = from_region_handle(getRegion()->getHandle());
1266
1267 // OK, for now, just have the composition value equal the height at the point. 1265 // OK, for now, just have the composition value equal the height at the point.
1268 LLVector3 location; 1266 LLVector3 location;
1269 LLColor4U coloru; 1267 LLColor4U coloru;
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 5a09433..69a5621 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -131,9 +131,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
131 131
132 mLastPointOfInterest = point_of_interest; 132 mLastPointOfInterest = point_of_interest;
133 133
134 // constrain to max distance from avatar
135 LLVector3 camera_offset = center - gAgent.getPositionAgent();
136
137 LLViewerRegion * regp = gAgent.getRegion(); 134 LLViewerRegion * regp = gAgent.getRegion();
138 F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f; 135 F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
139 136
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 59a87d5..22c17d9 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -977,7 +977,6 @@ void render_hud_attachments()
977 if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices()) 977 if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices())
978 { 978 {
979 LLCamera hud_cam = *LLViewerCamera::getInstance(); 979 LLCamera hud_cam = *LLViewerCamera::getInstance();
980 LLVector3 origin = hud_cam.getOrigin();
981 hud_cam.setOrigin(-1.f,0,0); 980 hud_cam.setOrigin(-1.f,0,0);
982 hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1)); 981 hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1));
983 LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE); 982 LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE);
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 386a86e..a9ea1e6 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -101,12 +101,11 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
101 sMediaRegionID = LLUUID() ; 101 sMediaRegionID = LLUUID() ;
102 stop() ; 102 stop() ;
103 LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL; 103 LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL;
104 return ; 104 return ;
105 } 105 }
106 106
107 // we're in a parcel 107 // we're in a parcel
108 bool new_parcel = false; 108 S32 parcelid = parcel->getLocalID();
109 S32 parcelid = parcel->getLocalID();
110 109
111 LLUUID regionid = gAgent.getRegion()->getRegionID(); 110 LLUUID regionid = gAgent.getRegion()->getRegionID();
112 if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID) 111 if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID)
@@ -114,7 +113,6 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
114 LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL; 113 LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL;
115 sMediaParcelLocalID = parcelid; 114 sMediaParcelLocalID = parcelid;
116 sMediaRegionID = regionid; 115 sMediaRegionID = regionid;
117 new_parcel = true;
118 } 116 }
119 117
120 std::string mediaUrl = std::string ( parcel->getMediaURL () ); 118 std::string mediaUrl = std::string ( parcel->getMediaURL () );