diff options
author | onefang | 2021-09-10 11:27:26 +1000 |
---|---|---|
committer | onefang | 2021-09-10 11:27:26 +1000 |
commit | daa3e79afdd8614231fdfb23fea6f8854b49475f (patch) | |
tree | d05673f3606c9041ed98173cc481fb36bc2d6a07 | |
parent | Another database schema fix for crazy. (diff) | |
download | opensim-SC-daa3e79afdd8614231fdfb23fea6f8854b49475f.zip opensim-SC-daa3e79afdd8614231fdfb23fea6f8854b49475f.tar.gz opensim-SC-daa3e79afdd8614231fdfb23fea6f8854b49475f.tar.bz2 opensim-SC-daa3e79afdd8614231fdfb23fea6f8854b49475f.tar.xz |
Give Sandbox sim a new UUID if we use it.
-rwxr-xr-x | example/etc/Sandbox.shini | 2 | ||||
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/example/etc/Sandbox.shini b/example/etc/Sandbox.shini index d356923..75e94e2 100755 --- a/example/etc/Sandbox.shini +++ b/example/etc/Sandbox.shini | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | [Region] | 4 | [Region] |
5 | RegionName = "Sandbox" | 5 | RegionName = "Sandbox" |
6 | RegionUUID = "7ed49d7a-6b50-4415-9991-3720e8f884d5" | 6 | RegionUUID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" |
7 | Location = "100,100" | 7 | Location = "100,100" |
8 | SizeX = 256 | 8 | SizeX = 256 |
9 | SizeY = 256 | 9 | SizeY = 256 |
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 6c1b5bb..ece9259 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c | |||
@@ -1805,7 +1805,10 @@ simList *getSims() | |||
1805 | // If there's no sims, create the default Sandbox. | 1805 | // If there's no sims, create the default Sandbox. |
1806 | if (0 == ourSims->num) | 1806 | if (0 == ourSims->num) |
1807 | { | 1807 | { |
1808 | if (shellMeFail("cp %s/current/example/etc/Sandbox.shini %s/etc/", scRoot, scRoot)) E("Failed to copy Sandbex.shini!"); | 1808 | // Give it a new UUID. Think that's why I can't HG from DG, coz that's the same UUID on both grids. |
1809 | create_uuid(toybuf); | ||
1810 | if (shellMeFail("sed -E -e 's/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/%s/' %s/current/example/etc/Sandbox.shini >%s/etc/Sandbox.shini", | ||
1811 | show_uuid(toybuf), scRoot, scRoot)) E("Failed to sed Sandbex.shini!"); | ||
1809 | simNotFound(NULL, "Sandbox", "unsorted", 0, 0, 0, 0); | 1812 | simNotFound(NULL, "Sandbox", "unsorted", 0, 0, 0, 0); |
1810 | if ((ourSims->num + 1) > ourSims->len) | 1813 | if ((ourSims->num + 1) > ourSims->len) |
1811 | { | 1814 | { |