From ad5f841c8a5d8bf35595927ad20a47138bda1fbd Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 27 Feb 2011 13:36:07 -0700 Subject: Fixed the imprudence.url file not using the new kokuaviewer wiki link --- linden/indra/newview/imprudence.url | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/linden/indra/newview/imprudence.url b/linden/indra/newview/imprudence.url index 9cc3cc0..d90f3b2 100644 --- a/linden/indra/newview/imprudence.url +++ b/linden/indra/newview/imprudence.url @@ -1,2 +1,6 @@ [InternetShortcut] -URL=http://imprudenceviewer.org/wiki/Features \ No newline at end of file +URL=http://wiki.kokuaviewer.org/wiki/Imprudence:Features +IDList= +HotKey=0 +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,2 -- cgit v1.1 From 3bec0a178dac9b6c30e7caf242fa6b648c9fff4a Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 27 Feb 2011 13:42:33 -0700 Subject: Re-enabled rezplat for OpenSim-based grids --- linden/indra/newview/floatercommandline.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/linden/indra/newview/floatercommandline.cpp b/linden/indra/newview/floatercommandline.cpp index 6889696..a700b62 100644 --- a/linden/indra/newview/floatercommandline.cpp +++ b/linden/indra/newview/floatercommandline.cpp @@ -32,7 +32,6 @@ #include "floatercommandline.h" -#include "hippogridmanager.h" #include "lluictrlfactory.h" #include "llviewercontrol.h" @@ -65,14 +64,6 @@ BOOL FloaterCommandLine::postBuild() childSetCommitCallback("CmdLineChatbarAO", onCommitApplyControl); childSetCommitCallback("CmdLineChatbarClearChat", onCommitApplyControl); - // hide options that don't work on non-SL-based grids - if (!gHippoGridManager->getConnectedGrid()->isSecondLife()) - { - childSetEnabled("CmdLineChatbarRezPlatform", FALSE); - childSetEnabled("loltxt6", FALSE); - childSetEnabled("CmdLineChatbarPlatformSize", FALSE); - } - return TRUE; } -- cgit v1.1 From f35ee68c66c8b483bf8b3bdfcfb413fe2ff74981 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 14 Jan 2011 19:16:31 +0100 Subject: postfix: new maximum number of groups in SL. --- linden/indra/newview/hippolimits.cpp | 4 +++- linden/indra/newview/llstartup.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp index 3368ba4..d4c8efb 100644 --- a/linden/indra/newview/hippolimits.cpp +++ b/linden/indra/newview/hippolimits.cpp @@ -85,7 +85,9 @@ void HippoLimits::setOpenSimLimits() void HippoLimits::setSecondLifeLimits() { llinfos << "Using Second Life limits" << llendl; - mMaxAgentGroups = 25; + S32 max_groups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups(); + mMaxAgentGroups = llmax(max_groups, 25); + mMaxPrimScale = 10.0f; mMinPrimScale = 0.01f; mMaxHeight = 4096.0f; diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 4bfcf52..bd94a59 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -1776,8 +1776,15 @@ bool idle_startup() if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp); tmp = LLUserAuth::getInstance()->getResponse("directory_fee"); if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str())); + + //OpenSim tmp = LLUserAuth::getInstance()->getResponse("max_groups"); if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str())); + + //SL + tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups"); + if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str())); + tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector"); if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp); gHippoGridManager->saveFile(); -- cgit v1.1 From d51a8d5c53262f2f3b8384fd463fa238753cd1d4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 16 Jan 2011 16:43:11 -0600 Subject: Better format for channel/version string. Before, it was "Imprudence #.#.# / Second Life #.#.#.#". Now, it's just "Imprudence #.#.#". --- linden/indra/newview/llappviewer.cpp | 47 ++++++++++++++---------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 6b98c8e..10f61a4 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -618,18 +618,16 @@ bool LLAppViewer::init() writeSystemInfo(); + // Build a string representing the current version number. - gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", - gSavedSettings.getString("VersionChannelName").c_str(), + gCurrentVersion = llformat( + "%s %d.%d.%d.%d", + gSavedSettings.getString("VersionChannelName").c_str(), ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), - ViewerVersion::getImpTestVersion().c_str(), - ViewerVersion::getLLViewerName().c_str(), - ViewerVersion::getLLMajorVersion(), - ViewerVersion::getLLMinorVersion(), - ViewerVersion::getLLPatchVersion(), - ViewerVersion::getLLBuildVersion() ); + 0 // our 'build number' + ); ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -2461,14 +2459,10 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["SLLog"] = LLError::logFileName(); gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName"); - gDebugInfo["ClientInfo"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion(); - gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion(); - gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion(); - gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion(); - gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); + gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion(); + gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion(); + gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion(); + gDebugInfo["ClientInfo"]["BuildVersion"] = 0; gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); @@ -2554,15 +2548,10 @@ void LLAppViewer::handleViewerCrash() //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version //to check against no matter what gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName"); - - gDebugInfo["ClientInfo"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion(); - gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion(); - gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion(); - gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion(); - gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); + gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion(); + gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion(); + gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion(); + gDebugInfo["ClientInfo"]["BuildVersion"] = 0; LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if ( parcel && parcel->getMusicURL()[0]) @@ -4334,11 +4323,11 @@ void LLAppViewer::handleLoginComplete() // Store some data to DebugInfo in case of a freeze. gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName"); + gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion(); + gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion(); + gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion(); + gDebugInfo["ClientInfo"]["BuildVersion"] = 0; - gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile"); gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName(); -- cgit v1.1 From b00ec58dc0553f419e9c3cfe7f494a4fc6d7f1f3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 22 Feb 2011 15:59:48 -0600 Subject: Updated default_grids.xml from current online grids list. --- .../indra/newview/app_settings/default_grids.xml | 39 ++++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml index 3f44e4b..802558a 100644 --- a/linden/indra/newview/app_settings/default_grids.xml +++ b/linden/indra/newview/app_settings/default_grids.xml @@ -1,7 +1,7 @@ - default_grids_version26 + default_grids_version31 @@ -16,7 +16,7 @@ supporthttp://secondlife.com/support/ registerhttp://secondlife.com/registration/ passwordhttp://secondlife.com/account/request.php - version0 + version2 @@ -31,7 +31,7 @@ supporthttp://secondlife.com/support/ registerhttp://secondlife.com/registration/ passwordhttp://secondlife.com/account/request.php - version1 + version3 @@ -57,22 +57,7 @@ supporthttp://osgrid.org/ registerhttp://www.osgrid.org/index.php/auth/register passwordhttp://www.osgrid.org/index.php/auth/forgot_password - version1 - - - - - gridnicklegendcityonline - gridnameLegend City Online - platformOpenSim - loginurihttp://login.legendcityonline.com - loginpagehttp://www.legendcityonline.com/welcome.php - helperurihttps://secure.legendcityonline.com/ - websitehttp://www.legendcityonline.com/ - supporthttp://www.legendcityonline.com/ - registerhttp://www.legendcityonline.com/ - passwordhttp://www.legendcityonline.com/ - version0 + version2 @@ -135,15 +120,17 @@ version0 - + - gridnickcyberlandia - gridnameCyberlandia + gridnickcraft + gridnameCraft platformOpenSim - loginurihttp://grid.cyberlandia.net:8002 - loginpage - helperuri - websitehttp://www.cyberlandia.net + loginurihttp://craft-world.org:8002/ + loginpagehttp://www.craft-world.org/loginscreen.php + helperurihttp://webapp.craft-world.org/ + websitehttp://www.craft-world.org/ + registerhttp://craft-world.org:8002/wifi/user/account/ + passwordhttp://craft-world.org:8002/wifi/forgotpassword version0 -- cgit v1.1 From 8312c0a9b0714ac18943e9e1949903438134079a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 22 Feb 2011 16:30:33 -0600 Subject: Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs. --- README.txt | 2 +- linden/indra/llcommon/llsecondlifeurls.cpp | 2 +- linden/indra/mac_updater/mac_updater.cpp | 2 +- linden/indra/newview/app_settings/settings.xml | 10 +++++----- linden/indra/newview/llappviewer.cpp | 2 +- linden/indra/newview/skins/default/xui/en-us/floater_about.xml | 2 +- linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++-- linden/indra/newview/skins/default/xui/en-us/notifications.xml | 10 +++++----- linden/indra/win_updater/updater.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.txt b/README.txt index 35f8115..5a56606 100644 --- a/README.txt +++ b/README.txt @@ -17,7 +17,7 @@ no matter your skills or the amount of time you can dedicate. - Imprudence is online at ImprudenceViewer.org + Imprudence is online at http://kokuaviewer.org/ The latest source code for the Imprudence Viewer is available at: diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp index 1669f7b..7be7bde 100644 --- a/linden/indra/llcommon/llsecondlifeurls.cpp +++ b/linden/indra/llcommon/llsecondlifeurls.cpp @@ -44,4 +44,4 @@ const std::string BUY_CURRENCY_URL ( const std::string RELEASE_NOTES_BASE_URL ( - "http://imprudenceviewer.org/wiki/Release_Notes/"); \ No newline at end of file + "http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/"); diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp index cf9de4b..03c6f6f 100644 --- a/linden/indra/mac_updater/mac_updater.cpp +++ b/linden/indra/mac_updater/mac_updater.cpp @@ -472,7 +472,7 @@ int main(int argc, char **argv) err = CreateStandardAlert( kAlertStopAlert, CFSTR("Error"), - CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://imprudenceviewer.org/download/"), + CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads"), ¶ms, &alert); diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 7ab3612..d5a7527 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -219,7 +219,7 @@ Type String Value - http://imprudenceviewer.org + http://blog.kokuaviewer.org BrowserLastVisited @@ -610,7 +610,7 @@ Type String Value - http://imprudenceviewer.org/app/grids/ + http://app.kokuaviewer.org/grids/grids.xml GoAction @@ -1702,7 +1702,7 @@ Type String Value - http://imprudenceviewer.org/app/client_list/ + http://app.kokuaviewer.org/client_list/ WarnClientTags @@ -1967,7 +1967,7 @@ Type String Value - http://imprudenceviewer.org/app/dics/ + http://kokuaviewer.org/app/dics/ EmeraldEnableAutoCorrect @@ -7725,7 +7725,7 @@ Type String Value - http://imprudenceviewer.org/splash/ + LogTextureDownloadsToViewerLog diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 10f61a4..268c4c0 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3277,7 +3277,7 @@ void LLAppViewer::badNetworkHandler() "the issue. \n" " \n" "If the problem continues, please report the issue at: \n" - "http://imprudenceviewer.org" << grid_support_msg; + "http://redmine.kokuaviewer.org/projects/imprudence" << grid_support_msg; forceDisconnect(message.str()); } diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml index ef02bfa..db4e11d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -9,7 +9,7 @@ word_wrap="true"> The Imprudence Viewer was rocked hard by: Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. - http://imprudenceviewer.org + http://kokuaviewer.org/ Imprudence is so awesome thanks to contributions from many generous people: diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index c2424d7..c2afe40 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -827,12 +827,12 @@ + userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" /> + userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" /> Imprudence -imprudenceviewer.org +kokuaviewer.org Second Life secondlife.com @@ -6889,7 +6889,7 @@ The region you have entered is running a different simulator version. Click this icon="notify.tga" name="QueryClientTags" type="notify"> -Would you like to have the client tag database automatically updated from imprudenceviewer.org? +Would you like to have the client tag database automatically updated from kokuaviewer.org? This ensures that you have the latest information available regarding other clients.
@@ -6961,7 +6961,7 @@ GRAVITY -- -9.8 For information about this feature, click "More Info". - http://imprudenceviewer.org/wiki/Build_Math_Expressions + http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions - http://imprudenceviewer.org/wiki/Build_Math_Expressions + http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions - http://imprudenceviewer.org/wiki/Restore_to_Last_Position + http://wiki.kokuaviewer.org/wiki/Imprudence:Restore_to_Last_Position WarnFirstPrivacy Comment - Enables FirstPrivacy warning on login + Warn about statistics packet when first logging in to Second Life. Persist 1 Type diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index 86beab5..47d3dbb 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml @@ -7304,22 +7304,20 @@ The new font will appear after you restart [VIEWER_NAME]. -Terms of service of the grid you are connecting to require sending a "statistics packet" every 5 minutes. -That is for example: Data about your hardware (CPU, RAM), number of avatars around, number of sims visited. -Please check *the grids* privacy policy about usage of that data. - -