From da34ca62889beb4b88d204e32e5db60e139beeb0 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 4 Dec 2008 15:09:42 -0700
Subject: Fixed localsim login url
---
linden/indra/newview/llviewernetwork.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden')
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 5b423ff..c8cffcf 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -60,7 +60,7 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
{ "Local OpenSim",
"",
"localhost",
- "http://0.0.0.0:9000",
+ "http://127.0.0.1:9000",
"" },
{ "Other", "", "", "", "" }
};
--
cgit v1.1
From 93eb46dcb67e35e99e3f68b4cb23ee9bf2fbb2d8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 4 Dec 2008 15:09:52 -0700
Subject: Fixed localsim login url
---
.../xui/en-us/floater_instant_message_group.xml | 164 ++--
linden/indra/newview/skins/silver/colors.xml | 6 +-
linden/indra/newview/skins/silver/colors_base.xml | 376 ++++-----
.../skins/silver/xui/en-us/panel_avatar.xml | 860 ++++++++++-----------
4 files changed, 703 insertions(+), 703 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index be18c7e..72c92bd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -1,82 +1,82 @@
-
-
-
- Joining Voice Chat...
-
-
- Connected, click End Call to hang up
-
-
- Left Voice Chat
-
-
- icn_voice-groupfocus.tga
-
-
- *** Welcome to Help Request ***
- Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
- If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
- -=-=- Response times will vary, especially during peak times -=-=-
-
-
- Instant Message with [NAME]
-
-
- [NAME] is typing...
-
-
- Starting session with [NAME], please wait.
-
-
- (Moderated: Voices off by default)
-
-
- Click here to instant message.
-
-
- Your text chat has been disabled by a Group Moderator.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Joining Voice Chat...
+
+
+ Connected, click End Call to hang up
+
+
+ Left Voice Chat
+
+
+ icn_voice-groupfocus.tga
+
+
+ *** Welcome to Help Request ***
+ Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
+ If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+ -=-=- Response times will vary, especially during peak times -=-=-
+
+
+ Instant Message with [NAME]
+
+
+ [NAME] is typing...
+
+
+ Starting session with [NAME], please wait.
+
+
+ (Moderated: Voices off by default)
+
+
+ Click here to instant message.
+
+
+ Your text chat has been disabled by a Group Moderator.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/silver/colors.xml b/linden/indra/newview/skins/silver/colors.xml
index 71a7787..cf9466f 100644
--- a/linden/indra/newview/skins/silver/colors.xml
+++ b/linden/indra/newview/skins/silver/colors.xml
@@ -1,3 +1,3 @@
-
-
-
+
+
+
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 19b6013..38db85c 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,188 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
index d564ac9..62738dc 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
@@ -1,430 +1,430 @@
-
-
-
-
-
- [ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-
-
- Resident
-
-
- Trial
-
-
- Charter Member
-
-
- Linden Lab Employee
-
-
- Payment Info Used
-
-
- Payment Info On File
-
-
- No Payment Info On File
-
-
- Age-verified
-
-
- Not Age-verified
-
-
- Name:
-
-
-
- Currently Online
-
-
- Born:
-
-
-
- Account:
-
-
-
-
- Partner:
-
-
-
-
- [FIRST] [LAST]
-
-
- Photo:
-
-
-
- Groups:
-
-
-
- About:
-
-
- (500 chars)
-
-
-
- Give item:
-
-
-
-
- Drop inventory item here.
-
-
-
-
-
-
-
-
-
-
-
-
-
- In external browser
- Home URL
-
-
-
-
-
-
-
-
- I Want To:
-
-
-
-
-
-
-
-
-
-
-
- Skills:
-
-
-
-
-
-
-
-
-
- Languages:
-
-
-
-
-
- Tell everyone about your favorite places in Second Life.
-
-
-
-
-
- Loading...
-
-
-
-
- Place an ad in Second Life's classified listings.
-
-
-
-
-
- Loading...
-
-
-
-
- Photo:
-
-
-
- Info:
-
-
- (250 chars)
-
-
-
-
-
- Loading...
-
-
- Use this space to record your notes about this person. Keep track
-of trades in progress, joint projects, etc. Only you can see these
-notes. This person cannot see them, nor can other people.
-
-
-
-
-
-
-
-
-
-
-
- Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-
-
- Show location on the map.
- Disabled because they are not online.
-
-
- Show location on the map.
-
-
- Force a teleport to your location.
-
-
- Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-
-
- Offer a teleport to your location.
-
-
- Loading...
-
-
+
+
+
+
+
+ [ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+
+
+ Resident
+
+
+ Trial
+
+
+ Charter Member
+
+
+ Linden Lab Employee
+
+
+ Payment Info Used
+
+
+ Payment Info On File
+
+
+ No Payment Info On File
+
+
+ Age-verified
+
+
+ Not Age-verified
+
+
+ Name:
+
+
+
+ Currently Online
+
+
+ Born:
+
+
+
+ Account:
+
+
+
+
+ Partner:
+
+
+
+
+ [FIRST] [LAST]
+
+
+ Photo:
+
+
+
+ Groups:
+
+
+
+ About:
+
+
+ (500 chars)
+
+
+
+ Give item:
+
+
+
+
+ Drop inventory item here.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ In external browser
+ Home URL
+
+
+
+
+
+
+
+
+ I Want To:
+
+
+
+
+
+
+
+
+
+
+
+ Skills:
+
+
+
+
+
+
+
+
+
+ Languages:
+
+
+
+
+
+ Tell everyone about your favorite places in Second Life.
+
+
+
+
+
+ Loading...
+
+
+
+
+ Place an ad in Second Life's classified listings.
+
+
+
+
+
+ Loading...
+
+
+
+
+ Photo:
+
+
+
+ Info:
+
+
+ (250 chars)
+
+
+
+
+
+ Loading...
+
+
+ Use this space to record your notes about this person. Keep track
+of trades in progress, joint projects, etc. Only you can see these
+notes. This person cannot see them, nor can other people.
+
+
+
+
+
+
+
+
+
+
+
+ Show location on the map.
+Disabled because you have not
+formed a friendship with them.
+
+
+ Show location on the map.
+ Disabled because they are not online.
+
+
+ Show location on the map.
+
+
+ Force a teleport to your location.
+
+
+ Offer a teleport to your location.
+Disabled until you leave Orientation Island.
+
+
+ Offer a teleport to your location.
+
+
+ Loading...
+
+
--
cgit v1.1
From d20e5190a67da2e70a68e6bac630c62e52c6aa0e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 5 Dec 2008 04:25:39 -0700
Subject: Windows now defaults to settings_imprudence.xml when run straight
from the exe.
---
linden/indra/newview/llappviewer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden')
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..bf45546 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1600,7 +1600,7 @@ bool LLAppViewer::initConfiguration()
// - set procedural settings
gSavedSettings.setString("ClientSettingsFile",
- gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+ gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
--
cgit v1.1