7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
f28dc77ab4
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 02:01:41 +01:00
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
1e7b7ffd6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 23:43:53 +01:00
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
dd416f4b63
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 15:27:50 +00:00
c8f0c8ebc4
Remove old Freeswitch configurations
2010-12-07 15:24:17 +00:00
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
4b979362e9
Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims
...
Removed some unneccessarily wordy core comments
2010-12-04 14:41:57 +01:00
96446adfa4
Monitor the UUIDs used to create and update wearable assets. Reject any changed
...
texture that is not present in the user's inventory full perm.
This will prevent "UUID snatching", a copybot-type of attack that can cause
clothing makers to be forced to destroy and replace legit items in order to
invalidate the copies.
2010-12-04 07:06:30 +01:00
6639aaeed4
Merge branch 'master' of /var/git/opensim/
2010-12-03 22:00:08 -08:00
cdd0df9aae
Merge branch 'master' of /var/git/opensim/
2010-12-03 21:30:05 -08:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
f41dfbabc8
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 05:01:44 +01:00
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
bab6b6cd87
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 04:36:44 +01:00
da91a2ab7e
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
755180612a
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:50:03 -08:00
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
2756e8fd67
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:40:03 -08:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
cc471d9ca6
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:40:03 -08:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
935929c2b8
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:10:03 -08:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
6770e43ef0
Merge branch 'master' of /var/git/opensim/
2010-12-03 16:50:02 -08:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
Melanie