diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs index f166976..75a51e2 100644 --- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs +++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | |||
| @@ -412,15 +412,15 @@ namespace OpenSim.Data.PGSQL | |||
| 412 | query = @"WITH upsert AS ( | 412 | query = @"WITH upsert AS ( |
| 413 | UPDATE userpicks SET | 413 | UPDATE userpicks SET |
| 414 | pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId, | 414 | pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId, |
| 415 | name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, | 415 | name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, |
| 416 | originalname = :Original, simname = :SimName, posglobal = :GlobalPos, | 416 | originalname = :Original, simname = :SimName, posglobal = :GlobalPos, |
| 417 | sortorder = :SortOrder, enabled = :Enabled | 417 | sortorder = :SortOrder, enabled = :Enabled |
| 418 | RETURNING * ) | 418 | RETURNING * ) |
| 419 | INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description, | 419 | INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description, |
| 420 | snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) | 420 | snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) |
| 421 | SELECT | 421 | SELECT |
| 422 | :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User, | 422 | :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User, |
| 423 | :Original,:SimName,:GlobalPos,:SortOrder,:Enabled | 423 | :Original,:SimName,:GlobalPos,:SortOrder,:Enabled |
| 424 | WHERE NOT EXISTS ( | 424 | WHERE NOT EXISTS ( |
| 425 | SELECT * FROM upsert )"; | 425 | SELECT * FROM upsert )"; |
| 426 | 426 | ||