ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-29 02:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,113 Commits 5 Branches 83 Tags
d31f361e8900aebb27f220bf0120dec5eb14c78a
Commit Graph

1451 Commits

Author SHA1 Message Date
UbitUmarov
d64fb216d2 try external bakedModule when local cache is invalid and not just at login 2014-08-14 15:39:46 +01:00
UbitUmarov
96cc4e5b95 reduced debug msgs 2014-08-14 04:01:54 +01:00
UbitUmarov
ab4df26309 only try external baked texture module on login 2014-08-14 03:47:18 +01:00
UbitUmarov
a1cc218f10 *DANGER* make baked textures cross and make use of it * UNTESTED * 
issue:  alll this seems to be sent back to childs, need to stop that
 2014-08-14 01:53:51 +01:00
UbitUmarov
1bd13155e6 put back baked textures debug msgs at start of validatebaked... 2014-08-13 20:43:26 +01:00
UbitUmarov
e860dd33fa remove confusing defonly control 2014-08-11 00:54:30 +01:00
UbitUmarov
306875fc61 ... one day.. 2014-08-11 00:49:11 +01:00
UbitUmarov
9217d5ca31 will get there.. 2014-08-11 00:44:34 +01:00
UbitUmarov
0a9925ff4a validatebaked still not ok 2014-08-11 00:28:14 +01:00
UbitUmarov
ebbf236abc of course.. bug.. 2014-08-08 02:25:31 +01:00
UbitUmarov
9aa6389b8b lock set appearence during ValidateBakedTextureCache there seems to be a 
overlap in same cases
 2014-08-08 02:22:18 +01:00
UbitUmarov
73cbdf2c6b bug 2014-08-07 22:00:23 +01:00
UbitUmarov
6d372f3d9e remove annoying debug msg . still a lot of spam, but to remove later 2014-08-07 21:37:11 +01:00
UbitUmarov
f788947594 make grid baked textures override the ones on appearance. Due to bug 
somewhere they are always bad at ValidateBakedTextures entry. ( even if
 they where good and on assets cache we whould need to generate the
 cacheID hash )
 2014-08-07 21:24:52 +01:00
UbitUmarov
38e2e5942c bug on upload new bakes decision 2014-08-07 19:16:51 +01:00
UbitUmarov
dfa9ba0937 minor clean, dont check for cache if we aren't using it.. 2014-08-07 08:47:03 +01:00
UbitUmarov
a95afb7fc5 bug 2014-08-07 07:36:23 +01:00
UbitUmarov
12d8ed2dcd only send to bakedmodule the baked textures :) 2014-08-07 07:08:01 +01:00
UbitUmarov
b7f24bacce bugg 2014-08-07 06:09:56 +01:00
UbitUmarov
c3f9c99fb3 DANGER... changed bakedtextures caching. Assuming grid baking is cache 
only, reduced number of accesses to it. TESTING
 2014-08-07 05:20:45 +01:00
UbitUmarov
8cf945544c local chat gods bug fix 2014-08-04 00:43:57 +01:00
UbitUmarov
21aa325883 remove debug msgs at attachments deRez 2014-08-03 19:41:48 +01:00
UbitUmarov
6b3f10790e bugg 2014-08-03 19:35:16 +01:00
UbitUmarov
c2d9a6499a dont get script states for NPCs on deRez 2014-08-03 19:08:13 +01:00
UbitUmarov
ca8b0e6a1d replace debug msgs by others 2014-08-03 19:00:01 +01:00
UbitUmarov
e87f70e277 god also read local chat 2014-08-02 22:45:28 +01:00
UbitUmarov
e5f9f064a7 filter local chat from avatars or attachment acording to parcel hide ( 
not fully tested)
 2014-08-01 01:43:12 +01:00
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