ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-19 14:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 87 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

1679 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
6dc1b113d0 Escape find string in PgSQL core groups plugin 2014-05-15 22:45:01 +01:00
Justin Clark-Casey (justincc)
d32d25634d Escape find string in MySQL core groups plugin 2014-05-15 22:09:37 +01:00
Oren Hurvitz
d15a3b10a3 When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6". 2014-04-24 15:58:41 +01:00
Oren Hurvitz
998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03:00
Oren Hurvitz
2c9859314f Changed table 'im_offline' to use UTF8 characters. This fixes a problem with Offline IM V2 (only relevant to MySQL). 
This fixes http://opensimulator.org/mantis/view.php?id=7123

Users that use MySQL should change their MySQL configuration to support UTF8. In the config file /etc/my.cnf (Linux) or my.ini (Windows), add these settings:

   [mysqld]
   character-set-server=utf8

   [client]
   default-character-set=utf8

And then restart MySQL (on Linux: "sudo service mysqld restart").
 2014-04-23 16:18:28 +03:00
Oren Hurvitz
93a9ed2a6d Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures. 2014-04-22 12:18:54 +03:00
Oren Hurvitz
acc2c42a79 Better logging in PresenceService, to help diagnose presence problems. 2014-04-21 18:55:53 +03:00
Justin Clark-Casey (justincc)
530c86335d Fix the presence info caching used in llRequestAgentData(), which was completely inoperative. 
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
 2014-04-11 00:29:06 +01:00
Oren Hurvitz
9211361b19 Fixed AssetsExist in SQLite 2014-04-02 10:00:09 +03:00
Oren Hurvitz
6b65895736 Made the SQLite unit tests work on Windows (sqlite3.dll wasn't being loaded) 2014-04-02 09:49:57 +03:00
Oren Hurvitz
d1c3f8eef5 Added assets service method AssetsExist(), which returns whether the given list of assets exist. 
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
 2014-04-02 06:30:57 +01:00
Justin Clark-Casey (justincc)
1247174db4 Fix MSSQLInventoryHandler.IncreementFolderVersion where sql accidentally used a MySQL style ?folderID insted of @folderID 
Thanks to LuciusSirnah in http://opensimulator.org/mantis/view.php?id=7075 for this fix
 2014-03-26 21:02:26 +00:00
Justin Clark-Casey (justincc)
de941d2ec7 minor: remove compiler warning from NullEstateData 2014-03-26 21:00:57 +00:00
Justin Clark-Casey (justincc)
7a4c5b067d Add MSSQL EstateStore.migrations VERSION 10 transaction to add AllowLandMark, AllowParcelChanges and AllowSetHome columns to estate_settings table. 
Taken from http://opensimulator.org/mantis/view.php?id=7074 by LuciusSirnah.  Thanks!
 2014-03-26 20:42:53 +00:00
Justin Clark-Casey (justincc)
5e8dfb4f7e Fix extra physics params MSSQL migration (version 39). 
This was failing because it used MySQL syntax
This is taken from Lucius Sirnah's entry in http://opensimulator.org/mantis/view.php?id=6593
But with the column existence checking removed, as this should not be necessary in a migration and is inconsistent with all other migrations, though I can see a case for doing it.
 2014-03-26 20:34:04 +00:00
Oren Hurvitz
1b30ae81b5 Fixed updating usersettings in the database 
Resolves http://opensimulator.org/mantis/view.php?id=6938
 2014-03-24 18:02:05 +01:00
Oren Hurvitz
b9e0d0fdb2 Don't show hidden groups in search results 
Resolves http://opensimulator.org/mantis/view.php?id=6937
 2014-03-24 18:01:56 +01:00
Justin Clark-Casey (justincc)
ae56b946cf Fix a bug in previous commit 01520bb where I accidentally saved OtherCleanTime instead of Dwell 2014-03-18 00:34:40 +00:00
Justin Clark-Casey (justincc)
01520bbb3e Save and load dwell parcel stat in MySQL DB adaptor. Field in table already exists! 
The SQLite database adaptor was loading and saving dwell whilst MySQL was not, even though the field already exists in the db table.
 2014-03-18 00:02:55 +00:00
Justin Clark-Casey (justincc)
71918eeab4 Add regression test for sending group notices via xmlrpc groups connector. 2014-03-07 01:04:54 +00:00
Robert Adams
e5d59dc696 Repair database routines so they properly return null when asked for 
the heighmap of a region that does not exist.
 2014-01-28 15:29:06 -08:00
Melanie
c6e9db5866 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2014-01-28 21:02:20 +00:00
Robert Adams
f127e4b4ee Merge branch 'master' into varregion 2014-01-19 07:38:53 -08:00
Justin Clark-Casey (justincc)
1a8b56fa87 Merge branch 'justincc-master' 2014-01-16 00:33:04 +00:00
Oren Hurvitz
46c2791fe2 In the offline message table, store the sender. 
This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
 2014-01-16 00:16:33 +00:00
Melanie
1eecb34e62 Remove the core module extra profile settings support carried in with the latest 
patches. We don't need it.
 2014-01-05 21:16:30 +00:00
Melanie
e79fab91db Intermediate commit. Sill errors. 
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
 2014-01-05 20:12:32 +00:00
Robert Adams
6937eec258 Merge branch 'master' into varregion 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-17 06:18:13 -08:00
BlueWall
141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05:00
BlueWall
b03ec6137f Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user. 2013-12-16 17:36:04 -05:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08:00
Melanie
958a8f274b Revert "Add support for user preferences (im via email)" 
This reverts commit 1842388bb4.
 2013-12-07 01:29:15 +00:00
Melanie
ba48816fb6 Merge branch 'master' into careminster 2013-12-07 01:19:20 +00:00
Melanie
6d6b9ab791 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-07 01:08:49 +00:00
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Robert Adams
4eb52eb19e Merge branch 'master' into varregion 2013-12-05 21:07:44 -08:00
BlueWall
04f8fc1ce9 Adding profile partners fix to SQLite and PgSQL drivers 2013-12-05 20:25:28 -05:00
BlueWall
823a175f07 Stop writing partner id to record when updating profile data. This should be changed only by admin in backend. 2013-12-05 20:06:04 -05:00
Fernando Oliveira
9b76a46df0 Reversing back to the row["ColumnName"] case field name. http://opensimulator.org/mantis/view.php?id=6868 2013-12-06 00:41:02 +00:00
Robert Adams
31bacfbb63 Merge branch 'master' into varregion 2013-12-01 15:51:42 -08:00
Fernando Oliveira
0ad45531a1 Corrected case to get columns from Regions table from PostgreSQL http://opensimulator.org/mantis/view.php?id=6865 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2013-11-25 18:33:49 -05:00
Robert Adams
3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Fernando Oliveira
f3f3d390f7 Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlight table, raising PrimaryKey violation; 
Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2013-11-22 20:48:12 -05:00
Robert Adams
beeec1c467 varregion: elimination of Constants.RegionSize from all over OpenSimulator. 
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
 2013-11-08 20:53:37 -08:00
Robert Adams
ac94dc8a14 varregion: remove unused terrain serialization code in SQLite and PGSQL modules 2013-11-04 22:06:20 -08:00
Melanie
ba203ed94f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-11-03 21:34:36 +00:00
Robert Adams
ff5885ab23 varregion: push TerrainData implementation up and down the database storage stack. 
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
 2013-11-01 11:35:31 -07:00
Robert Adams
2be0347f50 Merge branch 'master' into varregion 2013-10-28 09:30:26 -07:00
Fernando Oliveira
67ffb64764 Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs 2013-10-16 21:58:22 -05:00