Melanie
|
3302e8ddc4
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-31 00:57:50 +01:00 |
|
Diva Canto
|
86bc25b84f
|
Slight improvement on previous commit.
|
2010-07-30 14:27:53 -07:00 |
|
Diva Canto
|
f3fa10fa15
|
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
|
2010-07-30 14:04:29 -07:00 |
|
Diva Canto
|
8ab7d80b09
|
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
|
2010-07-30 14:04:13 -07: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)
|
63f3a16b72
|
remove empty, unused and uncalled UnsubscribeToClientEvents()
|
2010-07-30 21:44:50 +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)
|
4d83b2d8a6
|
remove unused BasicQuadTreeNode
|
2010-07-30 21:06:45 +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)
|
cdd3f17b2b
|
remove long unused OpenSim/Framework/Configuration/* projects
|
2010-07-30 20:19:46 +01:00 |
|
Justin Clark-Casey (justincc)
|
68b1d6f0af
|
Remove unused ILoginServiceToRegionsConnector
|
2010-07-30 20:02:00 +01:00 |
|
Justin Clark-Casey (justincc)
|
315b065bce
|
Remove unused LLFileTransfer
|
2010-07-30 19:58:29 +01:00 |
|
Justin Clark-Casey (justincc)
|
ce358db159
|
remove long superseded HGNetworkServersInfo
|
2010-07-30 19:54:27 +01:00 |
|
Justin Clark-Casey (justincc)
|
4596c78073
|
remove unused FriendRegionInfo
|
2010-07-30 19:50:47 +01:00 |
|
Justin Clark-Casey (justincc)
|
c7652d287b
|
remove now unused GridConfig, MessageServerConfig, UserConfig
|
2010-07-30 19:44:39 +01:00 |
|
Justin Clark-Casey (justincc)
|
f393e10ea4
|
remove unused ACL class
|
2010-07-30 19:34:55 +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 |
|
John Hurliman
|
b83910f12a
|
* Added debug logging to SimianGrid inventory service response parsing
|
2010-07-29 16:42:00 -07:00 |
|
Melanie
|
e0de8fa308
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-07-29 23:20:50 +01:00 |
|
Melanie Thielker
|
2257e39eda
|
Make dataserver() return a 0 when agent id offline, instead of a timeout
|
2010-07-29 23:20:38 +01:00 |
|
John Hurliman
|
550c3572a1
|
* Tweaked WebUtil.PostToService() to help debug an object disposed exception
|
2010-07-29 14:39:08 -07:00 |
|
Melanie
|
7a9e246ccd
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-29 16:20:59 +01: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 |
|
Melanie Thielker
|
516ec4acd0
|
Eat a lockign exception that kills scripts. May bear more investigation
in the long run.
|
2010-07-25 08:11:39 +02:00 |
|
Melanie
|
aa7cadca52
|
Add some options
|
2010-07-24 23:36:07 +01:00 |
|
Melanie
|
a9b7774fe0
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-07-24 23:15:38 +01:00 |
|
Melanie
|
4dbff62ef5
|
Fix some inventory issues
|
2010-07-24 23:15:06 +01:00 |
|
Justin Clark-Casey (justincc)
|
1a03a0b281
|
remove compile.bat from a created binary distribution
|
2010-07-23 23:12:30 +01:00 |
|
Justin Clark-Casey (justincc)
|
2f6fa373ef
|
in nant distbin, specifically only delete Regions.ini instead of the entire Regions directory
|
2010-07-23 22:36:03 +01:00 |
|
Melanie Thielker
|
83aec1ec94
|
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
|
2010-07-22 23:47:10 +02:00 |
|
Melanie Thielker
|
7ebabf185e
|
change the delay to 0.2s. My bad.
|
2010-07-22 19:31:02 +02:00 |
|
Melanie Thielker
|
ce8b9b4181
|
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
|
2010-07-22 19:20:09 +02:00 |
|
Diva Canto
|
0c0ac65d38
|
Added ': ' to password prompt. Mantis #4851
|
2010-07-22 04:00:24 -07:00 |
|
Melanie
|
7b471bb21c
|
Adding sample configuration to previous patch
|
2010-07-22 03:04:34 +01:00 |
|
Melanie
|
a70c7756b3
|
Add sending of the avatar interests and configuration of the profiles
module as an OpenSim profile module to Simian grid services.
Patch by Dimentox, thank you.
Applied with changes.
|
2010-07-22 03:01:50 +01:00 |
|
Melanie Thielker
|
fb89d0ff4e
|
Allow megaregions to be used in M7, should we so decide
|
2010-07-21 12:32:23 +02:00 |
|
Melanie Thielker
|
d4022becc3
|
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
2010-07-21 12:16:30 +02:00 |
|
Melanie
|
f63a4c8f2f
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-21 12:03:44 +01:00 |
|
Melanie Thielker
|
c72c84b455
|
Refine autoreturn a bit
|
2010-07-21 12:16:17 +02:00 |
|
Melanie
|
ac1a34714d
|
Allow Megaregions to start properly after an unclean shutdown
|
2010-07-20 23:24:04 +01:00 |
|
Diva Canto
|
f08afc4f87
|
Restore lines that have been removed due to previous merge conflict.
|
2010-07-20 14:28:17 -07:00 |
|
Melanie
|
4ccc141764
|
Resync with master
|
2010-07-20 21:49:31 +01:00 |
|
Melanie
|
c0b8cbd85b
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-20 21:47:53 +01:00 |
|
Melanie
|
dcf7973c9b
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-20 21:39:20 +01:00 |
|
Melanie
|
176cb01130
|
Remove a merge artefact
|
2010-07-20 21:38:31 +01:00 |
|
Melanie
|
686837d9ed
|
Merge branch 'master' into careminster-presence-refactor
|
2010-07-20 21:18:27 +01:00 |
|
Melanie Thielker
|
120d7014fd
|
When a god uses mass permission setting, the V bit is cleared from next
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
|
2010-07-20 21:01:46 +01:00 |