ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-03 07:26:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,911 Commits 5 Branches 88 Tags
243499ea4e10cb90f863199b83cd299afbd46c28
Commit Graph

1424 Commits

Author SHA1 Message Date
Melanie Thielker
bef76bf3c5 Fix duplicate attach message being sent to objects picked up from the ground 2014-07-20 01:52:26 +02:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Melanie Thielker
bb841ea9ce Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins 2014-04-06 23:22:37 +02: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
Oren Hurvitz
3018b2c5d7 Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default 
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
 2014-01-20 00:38:42 -08: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
BlueWall
141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05:00
Melanie
5b73b9c4a8 Committing the Avination Scene Presence and related texture code 
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
 2013-12-11 01:39:56 +00: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
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05: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
Justin Clark-Casey (justincc)
ecfb78dd16 minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null 
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
 2013-11-15 23:16:12 +00:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00: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
teravus
75fdd6054d * Refactor 
* Break out common BasicDOSProtector code into separate class.
 2013-10-07 23:19:50 -05:00
teravus
f76cc6036e * Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler 
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user,     It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
 2013-10-07 21:35:55 -05:00
Melanie
9800c6fa6c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2013-10-06 18:33:49 +01:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
teravus
ece2d24077 * Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't 
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
 2013-10-05 17:36:58 -05:00
Diva Canto
083eb7679b Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, shout-range, at the request of Singularity dev Liru-Dargon 2013-10-04 17:32:17 -07:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-10-04 20:03:12 +01:00
Justin Clark-Casey (justincc)
b16bc7b01c refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. 
Adds IScene.CloseAgent() to replace RemoveClient()
 2013-09-27 19:14:21 +01:00
Aleric Inglewood
2dc92e7de1 Preserve attachment point & position when attachment is rezzed in world 
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.

Fixed to apply to r/23314 commit
ba9daf849e
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
 2013-09-22 21:10:01 -05:00
Justin Clark-Casey (justincc)
a37c59b43e minor: Recomment out log message uncommented in previous cbdfe969 2013-09-21 00:40:23 +01:00
Oren Hurvitz
cbdfe96905 When giving items between avatars in different simulators, only add the item to the receiving avatar's inventory once. 
When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
 2013-09-21 00:32:56 +01:00
Justin Clark-Casey (justincc)
4c0ec86176 minor: Add prefix to log message in LureModule 2013-09-21 00:14:57 +01:00
Melanie
72206a0e29 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
 2013-09-16 22:32:53 +01:00
Melanie
2f365ea80b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-09-07 13:54:19 +01:00
BlueWall
9643915093 Remove test that gives issue on Windows, just let the try/catch do the work. 2013-09-02 16:28:40 -04:00
Justin Clark-Casey (justincc)
857f24a5e2 Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion. 
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
 2013-09-02 19:15:10 +01:00
Melanie
008c98a974 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-09-01 22:49:31 +01:00
BlueWall
56f565b601 Profiles: Clean up some log entries caused when visiting HG avatar is using legacy profiles 2013-08-29 16:54:13 -04:00
teravus
01c3be2746 * Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes. 
* Tweak XEngine so that it's partially functional again.    It's still not great, but basic things work.
 2013-08-24 05:55:53 -05:00
Robert Adams
c34e6f25b1 Fix a printing of exception error in InventoryArchiveModule that only 
printed the error message and not the call stack.
 2013-08-23 13:53:47 -07:00
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Justin Clark-Casey (justincc)
85a9cb260a Remove mono compiler warnings from UserProfilesModule 2013-08-17 01:10:58 +01:00
Justin Clark-Casey (justincc)
d75f00cc2d minor: remove mono compiler warning from AttachmentsModule 2013-08-17 01:09:31 +01:00
Justin Clark-Casey (justincc)
f5d3145bea Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regression test for v2 transfers. 
Also adjusts names of teleport setup helpers in EntityTransferHelpers
 2013-08-17 00:24:56 +01:00
Justin Clark-Casey (justincc)
1624522761 refactor: Make AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence 2013-08-16 23:45:04 +01:00
Justin Clark-Casey (justincc)
60cc9e9a3c minor: remove unused entity transfer config in teleport v2 attachments test 2013-08-14 23:21:18 +01:00
Melanie
4a6eff1ee8 Merge branch 'master' into careminster 2013-08-13 22:53:47 +01:00
Justin Clark-Casey (justincc)
b64d3ecaed Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for V2 transfer protocol. 2013-08-12 18:15:12 +01:00
Melanie
005c69511d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-08-07 23:29:42 +01:00
Melanie
598f63e984 Make atachment state load work again 2013-08-02 00:06:39 +01:00
Justin Clark-Casey (justincc)
c9695a0a59 Move experimental attachments throttling further down the chain so that multiple attachments changes (e.g. change outfit) are also throttled 2013-08-02 00:00:00 +01:00
Melanie
6fc03c7e6e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-08-01 23:42:19 +01:00
Melanie
bdc48e3e0f Make attachment state load work again 2013-08-01 23:30:32 +02:00
Justin Clark-Casey (justincc)
216e785ca9 Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config 
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging.  A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
 2013-08-01 21:16:53 +01:00
Melanie
bf283208df Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-07-29 02:08:05 +01:00