From 7dcbed8f9ae0ba8523a5ae72a32a462779edef9f Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Mon, 28 Mar 2011 02:24:19 +1000
Subject: Get the client tags from our own servers. Also, added the file for
future reference.
---
linden/indra/newview/app_settings/client_list.xml | 1442 +++++++++++++++++++++
linden/indra/newview/app_settings/settings.xml | 4 +-
2 files changed, 1444 insertions(+), 2 deletions(-)
create mode 100644 linden/indra/newview/app_settings/client_list.xml
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/client_list.xml b/linden/indra/newview/app_settings/client_list.xml
new file mode 100644
index 0000000..5aaf3f4
--- /dev/null
+++ b/linden/indra/newview/app_settings/client_list.xml
@@ -0,0 +1,1442 @@
+
+
+
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 183a910..b6858b7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1711,7 +1711,7 @@
Type
Boolean
Value
- 0
+ 1
ClientTagsListURL
@@ -1723,7 +1723,7 @@
Type
String
Value
- http://app.kokuaviewer.org/client_list/
+ http://login.meta7.com/client_list.xml
WarnClientTags
--
cgit v1.1
From 9d8d51a724155291317b539d9e61b44d566d0168 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 2 Apr 2011 23:42:55 +1000
Subject: Apparently the SDL pre built library has different version of these.
Some of them are things I would have to replace later for the meta branding.
But to stop in tree builds from bitching, for now use the ones from the pre build.
---
linden/indra/newview/res-sdl/ll_icon.BMP | Bin 0 -> 5174 bytes
linden/indra/newview/res-sdl/toolbuy.BMP | Bin 3126 -> 3126 bytes
linden/indra/newview/res-sdl/toolpay.BMP | Bin 3126 -> 3128 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 linden/indra/newview/res-sdl/ll_icon.BMP
(limited to 'linden/indra')
diff --git a/linden/indra/newview/res-sdl/ll_icon.BMP b/linden/indra/newview/res-sdl/ll_icon.BMP
new file mode 100644
index 0000000..4a44aaf
Binary files /dev/null and b/linden/indra/newview/res-sdl/ll_icon.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolbuy.BMP b/linden/indra/newview/res-sdl/toolbuy.BMP
index 4cd6d28..a00bdb2 100644
Binary files a/linden/indra/newview/res-sdl/toolbuy.BMP and b/linden/indra/newview/res-sdl/toolbuy.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpay.BMP b/linden/indra/newview/res-sdl/toolpay.BMP
index 72398df..819b620 100644
Binary files a/linden/indra/newview/res-sdl/toolpay.BMP and b/linden/indra/newview/res-sdl/toolpay.BMP differ
--
cgit v1.1
From 5a01e370feda0e2fb393aad549799a1e40beafde Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sun, 3 Apr 2011 01:23:16 +1000
Subject: Push some of the trivial changes from the accountList branch.
Should not change anything, and there will be more to come.
---
linden/indra/llcommon/llstring.cpp | 12 ++++++++++++
linden/indra/llcommon/llstring.h | 2 ++
2 files changed, 14 insertions(+)
(limited to 'linden/indra')
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 1f653c1..32a75c0 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -595,6 +595,18 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
return out;
}
+bool LLStringOps::isHexString(const std::string& str)
+{
+ const char* buf = str.c_str();
+ int len = str.size();
+ while (--len >= 0)
+ {
+ if (!isxdigit(buf[len])) return false;
+ }
+
+ return true;
+}
+
#if LL_WINDOWS
// documentation moved to header. Phoenix 2007-11-27
namespace snprintf_hack
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 61767ac..1717479 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -175,6 +175,8 @@ public:
static S32 collate(const char* a, const char* b) { return strcoll(a, b); }
static S32 collate(const llwchar* a, const llwchar* b);
+
+ static bool isHexString(const std::string& str);
};
/**
--
cgit v1.1