ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 19:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,874 Commits 5 Branches 86 Tags
1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a
Commit Graph

1440 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
Melanie
26387252f5 Merge branch 'master' into careminster-presence-refactor 2010-08-06 18:08:40 +01:00
Tom
03da22378e Estate managers should be allowed to add and remove new users, groups and bans to/from the estate settings. 2010-08-06 09:53:40 -07:00
Tom
52e2360e91 Since i've narrowed the fault down to one function, add some spammy debug to try and fix ghost prims on HUDs in future. Note, the console only gets messages if there is a problem, so it's harmless. 2010-08-06 08:08:43 -07:00
Justin Clark-Casey (justincc)
a133acbd5f Merge branch 'iar-merge' 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
 2010-08-04 20:56:52 +01:00
sacha
a48c493210 Cost Reduction : Removing verbose message.... 2010-08-04 08:16:55 +00:00
Tom
463fbb4990 If a user has no home position set, tell them so instead of leaving the request dangling 2010-08-04 00:17:02 -07:00
Melanie Thielker
bda83715e4 Clean up some messiness in IM sending. Having offline IM enabled now no longer 
suppresses "Inventory Saved" messages.
 2010-08-04 02:46:30 +01:00
Melanie Thielker
5ff9db7388 Clean up some messiness in IM sending. Having offline IM enabled now no longer 
suppresses "Inventory Saved" messages.
 2010-08-04 02:51:41 +02:00
Melanie Thielker
d57bfec702 A god is a god is a god is a god. Right? Right. You're a god from 200, let's 
show it!
 2010-08-04 02:16:46 +02:00
Justin Clark-Casey (justincc)
99c0f4c9c7 Simplify serialized version string. Change element capitalization for consistency 
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME.  If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
 2010-08-03 17:09:20 +01:00
Justin Clark-Casey (justincc)
9d8a67fe13 get rid of PrimitiveBaseShape.MediaRaw staging post 
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
 2010-08-03 16:26:27 +01:00
Justin Clark-Casey (justincc)
ac07d853b8 remove duplicated serialization code 2010-08-03 15:58:17 +01:00
Justin Clark-Casey (justincc)
60df76314f serialize media textures to inventory with a largely osd representation rather than .net auto-serialization 
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS.  If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
 2010-08-03 15:45:49 +01:00
Tom
b860c8021e First, change DefaultPermissionsModule so it returns the correct name... 
... Then, make sure we also check the old-style module stack before we throw a tantrum
 2010-08-01 10:23:48 -07:00
Melanie
3302e8ddc4 Merge branch 'master' into careminster-presence-refactor 2010-07-31 00:57:50 +01:00
Justin Clark-Casey (justincc)
f84dbafb0c remove gods event subscription to gods module from scene 2010-07-30 21:58:24 +01:00
Justin Clark-Casey (justincc)
424b4b2b86 move attachment subscription events into AttachmentsModule from scene. 
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
 2010-07-30 21:41:44 +01:00
Justin Clark-Casey (justincc)
f37ec933ae store terrain module trying to load plugins if plugin path does not exist 2010-07-30 20:54:02 +01:00
Justin Clark-Casey (justincc)
c6bc1d28ec move ChannelDigger from its own project into the main terrain module with the rest of the effects 2010-07-30 20:34:14 +01:00
Justin Clark-Casey (justincc)
5b80e3fc18 convert attachments module from old region module style to new 2010-07-30 19:26:54 +01:00
Melanie Thielker
f9280374d2 Bannination fixes. Objects in nonpublic parcels were muted by default. Gods 
were muted, too.
 2010-07-30 15:03:03 +02:00
Melanie Thielker
696b6c727f Allow gods and estate managers/owners to be unaffected by parcel bans 2010-07-29 16:20:40 +01:00
Melanie Thielker
7871dd606e Allow gods and estate managers/owners to be unaffected by parcel bans 2010-07-29 16:33:20 +02:00
Justin Clark-Casey (justincc)
f067f733ea add userExposed parameter to part copy event 2010-07-28 19:38:20 +01:00
Justin Clark-Casey (justincc)
0f15ccb2cf relocate moap specific cloning code to MoapModule 2010-07-28 19:23:30 +01:00
Justin Clark-Casey (justincc)
5aa56b1274 Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart 
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
 2010-07-28 18:55:29 +01:00
Justin Clark-Casey (justincc)
b149d8970e comment out verbose debug logging 2010-07-27 22:49:45 +01:00
Justin Clark-Casey (justincc)
30ac67fb3d make MoapModule ignore possible future media texture data that it can't handle 2010-07-27 20:15:43 +01:00
Justin Clark-Casey (justincc)
ac542a907b Make MoapModule ignore non-sl media texture data 2010-07-27 18:59:05 +01:00
Justin Clark-Casey (justincc)
4d23749241 provide config option for media on a prim 2010-07-26 23:34:23 +01:00
Justin Clark-Casey (justincc)
412fed975f relocate serialization code from SQLiteRegionData to MoapModule using load and save events. 
This is better modularity.  It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields.  MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
 2010-07-26 23:34:23 +01:00
Justin Clark-Casey (justincc)
b51b2efdc8 Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage 2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc)
586ae0f6a0 Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage. 2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc)
d764c95d09 also add avatar id to an updated media url - not just new ones 2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc)
b06308e1d3 Properly set TextureEntry.MediaFlags when a media texture is set 
Media flags is cleared via a direct TextureEntry update from the client.  If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received.  If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients.  It may also fix problems with clearing and then subsequently setting new media textures.
 2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc)
60c52ac0c4 start adding user ids to the media urls 2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc)
cd985ab71b Handle checking of line starting "*" wildcard for whitelist patterns 
A line starting * can only be applied to the domain, not the path
 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
664cbe2357 refactor: simplify current whitelist url checking by using System.Uri 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
0edabffb7d Implement * end wildcard for whitelist urls 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
dce7307aa2 properly expose prim media LSL functions to scripts 
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
049ccba8d3 fix previous media interact serverside checking. perform very basic serverside url whitelist checks 
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
cf7573c8fd implement code to deregister users on DeregisterCaps 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
ee6cd884c9 implement serverside checks for media texture navigation in order to stop naughty clients 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc)
a9101feb10 factor out soon to be common media permissions check code 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
51b208e96c implement prim media control permissions serverside in order to stop bad clients 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
e5615d3a9b discard an object media update message if it tries to set more media textures than the prim has faces 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
eb5e39d6ef Fire CHANGED_MEDIA event if a media texture is set or cleared 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
39a38c4901 implement llClearPrimMedia() 
untested
 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
d1a879927c fix issue with GetMediaEntry if the face requested wasn't set to a media texture 2010-07-26 23:34:20 +01:00