From afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Fri, 30 Jul 2010 15:57:46 -0400 Subject: remove useless assert and its temp variable that broke the build. --- indra/newview/llnearbychatbar.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 8a52cf715f..6c1fb69c02 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -393,8 +393,6 @@ LLGestureComboList::~LLGestureComboList() LLCtrlListInterface* LLGestureComboList::getListInterface() { - LLCtrlListInterface *result = mList; - llassert((LLCtrlListInterface*)mList==result); return mList; }; -- cgit v1.2.3 From 0847d29e0a7e1d76076ed1e6ac2ec721f0e126c6 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 30 Jul 2010 13:32:07 -0700 Subject: fix for DEV-52379 (viewer is not successfully caching object goemetry) There was a typo between the files saved and those loaded. saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc Q will review later ;-) --- indra/newview/llviewerregion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index da240cedbb..004d138221 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -429,7 +429,7 @@ void LLViewerRegion::saveCache() std::string filename; filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() + - llformat("sobjects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS ); + llformat("objects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS ); LLFILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ if (!fp) -- cgit v1.2.3 From d1094573117db0a951a7e6159a352b0f4c8a8a24 Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 30 Jul 2010 16:21:21 -0700 Subject: Upgraded NVIDIA 120 and 220 to class 1. They're performing too well. --- indra/newview/gpu_table.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index a481a6d395..da888bc64d 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -191,9 +191,9 @@ NVIDIA G102M .*NVIDIA.*GeForce G *102M.* 0 1 NVIDIA G103M .*NVIDIA.*GeForce G *103M.* 0 1 NVIDIA G105M .*NVIDIA.*GeForce G *105M.* 0 1 NVIDIA G210M .*NVIDIA.*GeForce G210M.* 0 1 -NVIDIA GT 120 .*NVIDIA.*GeForce GT 12.* 0 1 +NVIDIA GT 120 .*NVIDIA.*GeForce GT 12.* 1 1 NVIDIA GT 130 .*NVIDIA.*GeForce GT 13.* 1 1 -NVIDIA GT 220 .*NVIDIA.*GeForce GT 22.* 0 1 +NVIDIA GT 220 .*NVIDIA.*GeForce GT 22.* 1 1 NVIDIA GT 230 .*NVIDIA.*GeForce GT 23.* 1 1 NVIDIA GT 240 .*NVIDIA.*GeForce GT 24.* 1 1 NVIDIA GT 320 .*NVIDIA.*GeForce GT 32.* 0 1 -- cgit v1.2.3